Minor changes

This commit is contained in:
2016-12-08 09:45:30 +01:00
parent a41c6e935b
commit 3f15cddb3b
4 changed files with 19 additions and 12 deletions

19
DB.py
View File

@@ -545,13 +545,16 @@ class DB:
nav = NAV (path = "/srv/navision/", db = self)
nav.createcsv (data['dmc'])
try:
shutil.move ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share")
except:
self.errlog ("/srv/navision/share/%s.csv already esist" % data['dmc'])
os.rename ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share/%s.csv" % data['dmc'])
self.updatebde (data['dmc'], 'csv', 'erzeugt')
if "Error" in data['dmc']:
self.log (5, 'PD10 No Read')
else:
nav.createcsv (data['dmc'])
try:
shutil.move ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share")
except:
self.errlog ("/srv/navision/share/%s.csv already esist" % data['dmc'])
os.rename ("/srv/navision/%s.csv" % data['dmc'], "/srv/navision/share/%s.csv" % data['dmc'])
self.updatebde (data['dmc'], 'csv', 'erzeugt')
@@ -563,7 +566,7 @@ class DB:
try:
cursor = self.executesql ("UPDATE bde SET %s = '%s' WHERE dmc = '%s';" % (where, value, dmc))
except:
self.errlog ("Couldnt update field %s in table %s" % (where, field))
self.errlog ("Couldnt update field %s in table %s" % (field, where))
if where == 'chiron':
self.log (5, 'Where is Chiron no need to update')

View File

@@ -11,9 +11,12 @@ from parts import artikelnummer
def isotonav (isostr):
if isostr != '':
dt = datetime.strptime (isostr, '%Y-%m-%d %H:%M:%S')
dtl = dt.replace (tzinfo = pytz.utc).astimezone( pytz.timezone ('Europe/Berlin'))
return dtl.strftime ('%d.%m.%Y %H:%M:%S')
try:
dt = datetime.strptime (isostr, '%Y-%m-%d %H:%M:%S')
dtl = dt.replace (tzinfo = pytz.utc).astimezone( pytz.timezone ('Europe/Berlin'))
return dtl.strftime ('%d.%m.%Y %H:%M:%S')
except:
return ''
return ''

View File

@@ -39,5 +39,5 @@ pruefpunkte = {
'pp38' : ['chiron', ''],
'pp39' : ['chiron', ''],
'pp40' : ['chiron', ''],
'pp41' : ['masseblech', 'schaumring']
'pp41' : ['masseblech', 'schallisolierung']
}

View File

@@ -62,6 +62,7 @@ def decode_STAT (data):
decoderlist = {
b'PD01': decode_PD01,
b'PD02': decode_PD02,
b'PD03': decode_PD02,
b'PD05': decode_PD05,
b'PD06': decode_PD06,
b'PD07': decode_PD07,