m.stangl/SivasTools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Verwende jit_oracle_connection

Browse Source
This commit is contained in:
Anton Jakob
2023-10-04 11:51:14 +02:00
parent 6811ceb42d
commit 08ad12611a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sivas2Json/Sivas2json.py
+10 -11
View File
@@ -1,4 +1,4 @@
import cx_Oracle import oracledb
import os import os
import sys import sys
@@ -8,12 +8,10 @@ import re
import subprocess import subprocess
import argparse import argparse
from datetime import datetime from datetime import datetime
from jit_oracle_connection import JitOracleConnection
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'jit_oracle_connection'))
from oracle_connection import OracleConnection
args = None args = None
oracle_connection: OracleConnection = None oracle_connection: JitOracleConnection = None
def striprtf(text): def striprtf(text):
pattern = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I) 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") log_print(f"Keine Datensätze für diese Parameter gefunden")
return return
# log_print(f"Stücklistendaten geladen für Baugruppe {uebteilenr}\n")
for pos in pos_data: for pos in pos_data:
artikel_data = {} artikel_data = {}
artikel_data['Position'] = pos['POSITION'] artikel_data['Position'] = pos['POSITION']
@@ -276,9 +272,9 @@ def main():
args = parser.parse_args() args = parser.parse_args()
try: try:
cx_Oracle.init_oracle_client(lib_dir=instantclient_path) oracledb.init_oracle_client(lib_dir=instantclient_path)
except Exception as err: except Exception as err:
log_print("Error connecting: cx_Oracle.init_oracle_client()") log_print("Error connecting: oracledb.init_oracle_client()")
log_print(err) log_print(err)
sys.exit(1) sys.exit(1)
@@ -294,8 +290,11 @@ def main():
log_print('Oracle Verbindung...') log_print('Oracle Verbindung...')
try: try:
oracle_connection = OracleConnection('195.243.223.3', 'linux', instantclient_dir=instantclient_path, # oracle_connection = JitOracleConnection('195.243.223.3', 'linux', instantclient_dir=instantclient_path,
init_oracle_client=False) # 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: except Exception as e:
log_print(str(e)) log_print(str(e))