From 08ad12611aa1da3fc0fbaa9bc904cf86eeb9ff45 Mon Sep 17 00:00:00 2001 From: Anton Jakob Date: Wed, 4 Oct 2023 11:51:14 +0200 Subject: [PATCH] Verwende jit_oracle_connection --- Sivas2Json/Sivas2json.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Sivas2Json/Sivas2json.py b/Sivas2Json/Sivas2json.py index 84b6d01..057d655 100644 --- a/Sivas2Json/Sivas2json.py +++ b/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'] @@ -276,9 +272,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 +290,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))