json export angepast

Sivas2Json/Sivas2json.py

@@ -1,4 +1,4 @@
-import cx_Oracle
+import oracledb
 
 import os
 import sys
@@ -8,12 +8,10 @@ import re
 import subprocess
 import argparse
 from datetime import datetime
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'jit_oracle_connection'))
-from oracle_connection import OracleConnection
+from jit_oracle_connection import JitOracleConnection
 
 args = None
-oracle_connection: OracleConnection = None
+oracle_connection: JitOracleConnection = None
 
 def striprtf(text):
     pattern = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
@@ -179,8 +177,6 @@ def artikel_daten_schreiben(uebteilenr: str, json_data: {}, csv_rows: [{}], leve
         log_print(f"Keine Datensätze für diese Parameter gefunden")
         return
 
-    # log_print(f"Stücklistendaten geladen für Baugruppe {uebteilenr}\n")
-
     for pos in pos_data:
         artikel_data = {}
         artikel_data['Position'] = pos['POSITION']
@@ -244,7 +240,12 @@ def artikel_daten_schreiben(uebteilenr: str, json_data: {}, csv_rows: [{}], leve
             ag_content['Stückzeit'] = int(ag['STUECKZEIT'])
             artikel_data['Arbeitsgänge'].append(ag_content)
 
-        json_data[artikel_data['Zeichnungsnummer']] = artikel_data
+        artikel_data_list_of_dict = [artikel_data]
+        if artikel_data['Zeichnungsnummer'] in json_data:
+            artikel_data_list_of_dict = json_data[artikel_data['Zeichnungsnummer']]
+            artikel_data_list_of_dict.append(artikel_data)
+
+        json_data[artikel_data['Zeichnungsnummer']] = artikel_data_list_of_dict
 
         if pos['BAUGRUPPE']:
             artikel_daten_schreiben(pos['BAUGRUPPE'], json_data, csv_rows, level+1)
@@ -276,9 +277,9 @@ def main():
     args = parser.parse_args()
 
     try:
-        cx_Oracle.init_oracle_client(lib_dir=instantclient_path)
+        oracledb.init_oracle_client(lib_dir=instantclient_path)
     except Exception as err:
-        log_print("Error connecting: cx_Oracle.init_oracle_client()")
+        log_print("Error connecting: oracledb.init_oracle_client()")
         log_print(err)
         sys.exit(1)
 
@@ -294,8 +295,11 @@ def main():
     log_print('Oracle Verbindung...')
 
     try:
-        oracle_connection = OracleConnection('195.243.223.3', 'linux', instantclient_dir=instantclient_path,
-                                             init_oracle_client=False)
+        # oracle_connection = JitOracleConnection('195.243.223.3', 'linux', instantclient_dir=instantclient_path,
+        #                                      init_oracle_client=False)
+        oracle_connection = JitOracleConnection(db_host='195.243.223.3', db_sid='linux', db_user='sivas', db_pwd='forte',
+                                                db_database='sivas', instantclient_dir=instantclient_path, tns_admin=None, app=None,
+                                                init_oracle_client=True)
     except Exception as e:
         log_print(str(e))