diff --git a/core/runtime/savedata.py b/core/runtime/savedata.py index 8750dde..618b14e 100644 --- a/core/runtime/savedata.py +++ b/core/runtime/savedata.py @@ -110,7 +110,7 @@ def readRow(action, resolved, outputs): columnattr = "" columnattr = key + " " + value - print(columnattr) + #print(columnattr) column_creation.append(columnattr) rowsearchvalue = action.readrow["rowsearchvalue"] @@ -124,6 +124,10 @@ def readRow(action, resolved, outputs): value = resolved[item["resolved"]] values.append(value) + + exports = action.readrow["export"] + for column_index, output_name in exports.items(): + outputs.pop(output_name, None) database = sqlite3.connect("savedata/rmmanager.db") @@ -142,21 +146,25 @@ def readRow(action, resolved, outputs): """, (value,) ) - print("DEBUG RESOLVED TARGET ITEM") - print(value) + #print("DEBUG READROW TARGET ITEM") + #print(value) result = cursor.fetchone() - print(result) - - try: - target = result[action.readrow["columnnumber"]] - except TypeError: - target = None - print("Message ID not found in database") - - outputs["databasetarget"] = target + ## extension for matching by unique item vs column find + if result is not None: + for column_index, output_name in exports.items(): + dbtarget = result[column_index] + outputs[output_name] = dbtarget# result[column_index] + #print("DEBUGGING DATABASE LINE EXTRACTION IN READROW") + #print(outputs[output_name]) + #print(dbtarget) - print("READROW TEST") - print(target) + return resolved, outputs + else: + print(f"Search target {value} not found in database table {table}") + return resolved, outputs + + #print("READROW SEARCH RESULT") + #print(target) return resolved, outputs \ No newline at end of file