Added seperation of Locklist and NiO List

getlocklist.py

@@ -40,7 +40,11 @@ def updatelockist (dbconn = None, delete_after = False):
     for part in mail.walk():
       if part.get_content_type () in ('text/csv', 'text/plain'):
         filename = part.get_filename ()
+        src = 'Sperr'
+
         if filename and  not '/' in filename:
+          if 'NIO' in filename:
+            src = 'NIO'
           filename = strftime ("%Y-%m-%d_%H%M%S_") + filename
           #Attack protection
           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')
           print ('CSV - %d Rows' % len (csvdata))
 
-          dbconn.cleanlock () 
+          dbconn.cleanlock (src) 
           print (dbconn.locksize ())
           for line in (csvdata)[1:]:
             #40690113240317929764416;9297644;16;24.03.2017 10:35:05;14498
             values = line.split (';')
-            if len (values) == 5:
+            if len (values) in (4, 5):
               try:
                 dmc = int (values [0])
                 rtn = int (values [1])
                 idx = int (values [2])
                 t,m,y = values[3].split (' ')[0].split ('.')
                 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), 
                         'rohteilnr' : str (rtn),
                         'aenderungsidx' : str (idx),
                         'sperrts' : str (dat),
-                        'sperrnr' : str (snr)}
+                        'sperrnr' : str (snr),
+                        'quelle' : src}
                 dbconn.addlock (data)
                 print ("Added Lock", data)
               except: