diff --git a/scratchpad.ipynb b/scratchpad.ipynb
index 5d84840..362d2c9 100644
--- a/scratchpad.ipynb
+++ b/scratchpad.ipynb
@@ -9,7 +9,7 @@
},
{
"cell_type": "code",
- "execution_count": 127,
+ "execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
@@ -26,7 +26,7 @@
},
{
"cell_type": "code",
- "execution_count": 128,
+ "execution_count": 4,
"metadata": {},
"outputs": [
{
@@ -48,16 +48,16 @@
"None\n",
"('1', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n 1\\n 4\\n \\n \\n 2\\n 5\\n \\n \\n 3\\n 6\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
"('2', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
- "('3', '\\n \\n \\n \\n \\n \\n C:\\\\Users\\\\Casey\\\\AppData\\\\Local\\\\Temp\\\\Engine_4072_8b6c0740e308d445ab856d90eb0e4ee9_\\\\Engine_4072_93f5c2999bcb8c478c002b15166e2b45~.yxdb\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
+ "('3', '\\n \\n \\n \\n \\n \\n C:\\\\Users\\\\casey.morter\\\\AppData\\\\Local\\\\Temp\\\\Engine_24220_fcf44807b57fab4cb64cc2e4b0cb337e_\\\\Engine_24220_f76621528201864d89236be538ce397e~.yxdb\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
"('4', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n 5\\n 8\\n z\\n a\\n \\n \\n 6\\n 9\\n b\\n d\\n \\n \\n 7\\n 10\\n c\\n c\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
"('5', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
"('6', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n MoreCount = [Count] + 10\\n\\n \\n \\n \\n \\n \\n ')\n",
"('7', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
- "('10', '\\n \\n \\n \\n \\n \\n C:\\\\Users\\\\Casey\\\\AppData\\\\Local\\\\Temp\\\\Engine_4072_8b6c0740e308d445ab856d90eb0e4ee9_\\\\Engine_4072_ab9b90f8fc991440905d667f1d5c7325~.yxdb\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
+ "('10', '\\n \\n \\n \\n \\n \\n C:\\\\Users\\\\casey.morter\\\\AppData\\\\Local\\\\Temp\\\\Engine_24220_fcf44807b57fab4cb64cc2e4b0cb337e_\\\\Engine_24220_f4c1fee3627dfb489419190371153cab~.yxdb\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
"('11', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n Path = [Engine.TempFilePath]\\n\\n \\n \\n \\n \\n \\n ')\n",
"('12', '\\n \\n \\n \\n \\n \\n First\\n 1\\n \\n \\n \\n \\n First 1\\n \\n \\n \\n \\n \\n ')\n",
- "('13', '\\n \\n \\n \\n \\n \\n C:\\\\Users\\\\Casey\\\\AppData\\\\Local\\\\Temp\\\\Engine_4072_8b6c0740e308d445ab856d90eb0e4ee9_\\\\Engine_4072_dd72ded80941104b9b9be56761379cb2~.yxdb\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
- "('14', '\\n \\n \\n \\n \\n \\n .\\\\SimpleWorkflowOut.csv\\n \\n False\\n \\n CRLF\\n ,\\n False\\n True\\n 28591\\n True\\n \\n \\n \\n \\n \\n SimpleWorkflowOut.csv\\n \\n \\n \\n \\n \\n ')\n",
+ "('13', '\\n \\n \\n \\n \\n \\n C:\\\\Users\\\\casey.morter\\\\AppData\\\\Local\\\\Temp\\\\Engine_24220_fcf44807b57fab4cb64cc2e4b0cb337e_\\\\Engine_24220_786c4b26fed826499b55ead59d943d58~.yxdb\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
+ "('14', '\\n \\n \\n \\n \\n \\n .\\\\SimpleWorkflowOut.csv\\n \\n \\n CRLF\\n ,\\n False\\n True\\n 28591\\n True\\n \\n \\n \\n \\n \\n SimpleWorkflowOut.csv\\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n",
"('15', '\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n a\\n a\\n 4\\n \\n \\n b\\n d\\n 6\\n \\n \\n c\\n z\\n 7\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n ')\n"
]
}
@@ -92,7 +92,7 @@
},
{
"cell_type": "code",
- "execution_count": 129,
+ "execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
@@ -131,7 +131,7 @@
},
{
"cell_type": "code",
- "execution_count": 130,
+ "execution_count": 6,
"metadata": {},
"outputs": [
{
@@ -139,7 +139,7 @@
"evalue": "expected an indented block after function definition on line 1 (2015830356.py, line 5)",
"output_type": "error",
"traceback": [
- "\u001b[1;36m Cell \u001b[1;32mIn[130], line 5\u001b[1;36m\u001b[0m\n\u001b[1;33m xml_join_tool = results[6][1]\u001b[0m\n\u001b[1;37m ^\u001b[0m\n\u001b[1;31mIndentationError\u001b[0m\u001b[1;31m:\u001b[0m expected an indented block after function definition on line 1\n"
+ "\u001b[1;36m Cell \u001b[1;32mIn[6], line 5\u001b[1;36m\u001b[0m\n\u001b[1;33m xml_join_tool = results[6][1]\u001b[0m\n\u001b[1;37m ^\u001b[0m\n\u001b[1;31mIndentationError\u001b[0m\u001b[1;31m:\u001b[0m expected an indented block after function definition on line 1\n"
]
}
],
@@ -158,7 +158,7 @@
},
{
"cell_type": "code",
- "execution_count": 76,
+ "execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -232,7 +232,7 @@
},
{
"cell_type": "code",
- "execution_count": 131,
+ "execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
@@ -251,7 +251,7 @@
},
{
"cell_type": "code",
- "execution_count": 132,
+ "execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
@@ -279,15 +279,14 @@
},
{
"cell_type": "code",
- "execution_count": 133,
+ "execution_count": 32,
"metadata": {},
"outputs": [
{
- "ename": "SyntaxError",
- "evalue": "invalid syntax (213487073.py, line 22)",
- "output_type": "error",
- "traceback": [
- "\u001b[1;36m Cell \u001b[1;32mIn[133], line 22\u001b[1;36m\u001b[0m\n\u001b[1;33m if fields.attrib['selected'] == 'True' and fields.attrib['field'] != :\u001b[0m\n\u001b[1;37m ^\u001b[0m\n\u001b[1;31mSyntaxError\u001b[0m\u001b[1;31m:\u001b[0m invalid syntax\n"
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "{'joinParams': ['Ham', 'Cheese'], 'fields': {'Right_Ham': ['Right_Ham', 'Right_', None, None], 'Right_Cheese': ['Right_Cheese', 'Right_', None, None], 'Right_Column 3': ['Right_Column 3', 'Right_', 'V_String', '11'], 'Right_Column 4': ['Right_Column 4', 'Right_', 'Int64', '8']}}\n"
]
}
],
@@ -304,7 +303,7 @@
" right_on = [field.attrib['field'] for field in joinField]\n",
"\n",
" if left_on == right_on:\n",
- " dict_JoinTool['joinParams'] = ('on', left_on)\n",
+ " dict_JoinTool['joinParams'] = (left_on)\n",
" else:\n",
" dict_JoinTool['joinParams'] = (left_on, right_on)\n",
"\n",
@@ -313,14 +312,15 @@
" fieldConfig = {}\n",
" for fields in root.findall(\".//SelectField\"):\n",
" result = []\n",
- " if fields.attrib['selected'] == 'True' and fields.attrib['field'] != :\n",
+ " if fields.attrib['selected'] == 'True':\n",
" for field in ['rename', 'input', 'type', 'size']:\n",
" try:\n",
" result.append(fields.attrib[field])\n",
" except KeyError:\n",
" result.append(None)\n",
"\n",
- " fieldConfig[fields.attrib['field']] = result\n",
+ " if fields.attrib['field'] != '*Unknown':\n",
+ " fieldConfig[fields.attrib['field']] = result\n",
"\n",
"\n",
" dict_JoinTool['fields'] = fieldConfig\n",
@@ -330,83 +330,6 @@
"print(getConf_Join(xml_join_tool))"
]
},
- {
- "cell_type": "code",
- "execution_count": 134,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "{'joinParams': ([, ], [, ]), 'SelectFields': {'Right_Ham': ('True', 'Right_Ham', 'Right_', None), 'Right_Cheese': ('True', 'Right_Cheese', 'Right_', None), 'Right_Column 3': ('True', 'Right_Column 3', 'Right_', 'V_String'), 'Right_Column 4': ('True', 'Right_Column 4', 'Right_', 'Int64'), '*Unknown': ('True', None, None, None)}}\n"
- ]
- }
- ],
- "source": [
- "def getConf_Join(xml_string):\n",
- " # print(xml_string)\n",
- " root = ET.fromstring(xml_string)\n",
- " dict_JoinTool = {}\n",
- "\n",
- " # print(\"joinByRecordPos:\", root.find(\".//Properties/Configuration\").attrib['joinByRecordPos'])\n",
- "\n",
- " # Join parameters\n",
- " for joinField in root.findall(\".//Configuration/JoinInfo\"):\n",
- " \n",
- "\n",
- " # left_on = [joinField.findall('Field') for c in joinField.attrib['connection'] == \"Left\"] \n",
- "\n",
- " if joinField.attrib['connection'] == \"Left\":\n",
- " pass\n",
- " left_on = joinField.findall('Field') #.attrib['field']\n",
- "\n",
- "\n",
- "\n",
- " \n",
- " # for field in left_on:\n",
- " # print(field.attrib['field'])\n",
- "\n",
- " elif joinField.attrib['connection'] == \"Right\":\n",
- " right_on = joinField.findall('Field') #.attrib['field']\n",
- "\n",
- " if left_on == right_on:\n",
- " dict_JoinTool['joinParams'] = ('on', left_on)\n",
- " else:\n",
- " dict_JoinTool['joinParams'] = (left_on, right_on)\n",
- "\n",
- " fieldConfig = {}\n",
- "\n",
- " # Select parameters\n",
- " for joinField in root.findall(\".//SelectField\"):\n",
- " field = joinField.attrib['field']\n",
- " fieldSelected = joinField.attrib['selected']\n",
- "\n",
- " if field != \"*Unknown\":\n",
- " try:\n",
- " fieldRename = joinField.attrib['rename']\n",
- " except:\n",
- " fieldRename = None\n",
- " try:\n",
- " fieldType = joinField.attrib['type']\n",
- " except:\n",
- " fieldType = None\n",
- "\n",
- " fieldInput = joinField.attrib['input']\n",
- "\n",
- " fieldConfig[field] = (fieldSelected, fieldRename, fieldInput, fieldType)\n",
- "\n",
- " fieldRename = None\n",
- " fieldType = None \n",
- " fieldInput = None\n",
- "\n",
- " dict_JoinTool[\"SelectFields\"] = fieldConfig\n",
- " return dict_JoinTool\n",
- "\n",
- "xml_join_tool = results[6][1]\n",
- "print(getConf_Join(xml_join_tool))\n"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -573,13 +496,6 @@
"for tool in results:\n",
" print(tool)"
]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
}
],
"metadata": {