use sfo_tz_run.transferstate instead of tzstate

Script/cs/Tools/Libraries/Database.py

@@ -320,7 +320,7 @@ class Database():
         if state == 'CLOSED':
 
             sql="update "+ self.run_table
-            sql+=" set state='TRANSFERRED', tzstate='TRANSFERRED', t_stamp = :newdate"
+            sql+=" set state='TRANSFERRED', transferstate='TRANSFERRED', t_stamp = :newdate"
             sql+=" where sfoid = :ssfo and runnr = :srunnr "
             sql+=" and streamtype = :sstreamt and stream = :sstreamn "
             sql+=" and state = 'CLOSED'"
@@ -354,19 +354,19 @@ class Database():
         keys['sstreamn']=parsed.StreamName()
 
         sql="update "+ self.run_table
-        sql+=" set tzstate='TRANSFERRING', t_stamp = :newdate"
+        sql+=" set transferstate='TRANSFERRING', t_stamp = :newdate"
         sql+=" where sfoid = :ssfo and runnr = :srunnr"
         sql+=" and streamtype = :sstreamt and stream = :sstreamn"
-        sql+=" and tzstate != 'TRANSFERRING'" # avoid unnecessary update and overwriting of t_stamp
+        sql+=" and (transferstate is NULL or transferstate != 'TRANSFERRING')" # avoid unnecessary update and overwriting of t_stamp
 
         keys['newdate'] = datetime.datetime.utcfromtimestamp(time.time())
 
         args = [sql,]
         nrow = self.db.execute(args,keys)
         self.logger.debug(
-            'tzstate update for SFO %s, run %s, stream type %s, stream name %s: %s row updated'
-            , str(parsed.AppId()), str(parsed.RunNr()), str(parsed.StreamType())
-            , str(parsed.StreamName()), str(nrow))
+            'transferstate update for SFO %s, run %s, stream type %s, stream name %s: %s row updated'
+            , parsed.AppId(), parsed.RunNr(), parsed.StreamType()
+            , parsed.StreamName(), str(nrow))
 
 
     def notTransFiles(self,parsed):