Added seperation of Locklist and NiO List
This commit is contained in:
@@ -40,7 +40,11 @@ def updatelockist (dbconn = None, delete_after = False):
|
|||||||
for part in mail.walk():
|
for part in mail.walk():
|
||||||
if part.get_content_type () in ('text/csv', 'text/plain'):
|
if part.get_content_type () in ('text/csv', 'text/plain'):
|
||||||
filename = part.get_filename ()
|
filename = part.get_filename ()
|
||||||
|
src = 'Sperr'
|
||||||
|
|
||||||
if filename and not '/' in filename:
|
if filename and not '/' in filename:
|
||||||
|
if 'NIO' in filename:
|
||||||
|
src = 'NIO'
|
||||||
filename = strftime ("%Y-%m-%d_%H%M%S_") + filename
|
filename = strftime ("%Y-%m-%d_%H%M%S_") + filename
|
||||||
#Attack protection
|
#Attack protection
|
||||||
fp = open (os.path.join ('/srv/lockfiles', filename), 'wb')
|
fp = open (os.path.join ('/srv/lockfiles', filename), 'wb')
|
||||||
@@ -49,26 +53,29 @@ def updatelockist (dbconn = None, delete_after = False):
|
|||||||
csvdata = (part.get_payload (decode = 0)).split ('\n')
|
csvdata = (part.get_payload (decode = 0)).split ('\n')
|
||||||
print ('CSV - %d Rows' % len (csvdata))
|
print ('CSV - %d Rows' % len (csvdata))
|
||||||
|
|
||||||
dbconn.cleanlock ()
|
dbconn.cleanlock (src)
|
||||||
print (dbconn.locksize ())
|
print (dbconn.locksize ())
|
||||||
for line in (csvdata)[1:]:
|
for line in (csvdata)[1:]:
|
||||||
#40690113240317929764416;9297644;16;24.03.2017 10:35:05;14498
|
#40690113240317929764416;9297644;16;24.03.2017 10:35:05;14498
|
||||||
values = line.split (';')
|
values = line.split (';')
|
||||||
if len (values) == 5:
|
if len (values) in (4, 5):
|
||||||
try:
|
try:
|
||||||
dmc = int (values [0])
|
dmc = int (values [0])
|
||||||
rtn = int (values [1])
|
rtn = int (values [1])
|
||||||
idx = int (values [2])
|
idx = int (values [2])
|
||||||
t,m,y = values[3].split (' ')[0].split ('.')
|
t,m,y = values[3].split (' ')[0].split ('.')
|
||||||
dat = '%s.%s.%s %s' % (y,m,t,values[3].split (' ')[1])
|
dat = '%s.%s.%s %s' % (y,m,t,values[3].split (' ')[1])
|
||||||
snr = int (values [4])
|
snr = 0
|
||||||
|
if len (values) == 5:
|
||||||
|
snr = int (values [4])
|
||||||
|
|
||||||
|
|
||||||
data = {'dmc' : str (dmc),
|
data = {'dmc' : str (dmc),
|
||||||
'rohteilnr' : str (rtn),
|
'rohteilnr' : str (rtn),
|
||||||
'aenderungsidx' : str (idx),
|
'aenderungsidx' : str (idx),
|
||||||
'sperrts' : str (dat),
|
'sperrts' : str (dat),
|
||||||
'sperrnr' : str (snr)}
|
'sperrnr' : str (snr),
|
||||||
|
'quelle' : src}
|
||||||
dbconn.addlock (data)
|
dbconn.addlock (data)
|
||||||
print ("Added Lock", data)
|
print ("Added Lock", data)
|
||||||
except:
|
except:
|
||||||
|
|||||||
Reference in New Issue
Block a user