Browse Source

Cleared error from getData updateStatus, making sure that status is also checked for entries with converted images

Andrej Studen@Labkey-KNM 1 year ago
parent
commit
5bffcfe431
2 changed files with 5 additions and 2 deletions
  1. 1 1
      pythonScripts/getData.py
  2. 4 1
      slicerScripts/convertToNRRD.py

+ 1 - 1
pythonScripts/getData.py

@@ -167,7 +167,7 @@ def getPatientNIM(fb,r,setup):
 
 def updateStatus(db,r,setup,var,status=True):
 #update status of var to status
-   fVars=['patientCode','visitCode']
+   fVars=['PatientId','visitCode']
    qFilter=[{'variable':x,'value':'{}'.format(r[x]),'oper':'eq'} for x in fVars]
    ds=db.selectRows(setup['project'],'study','processingStatus',qFilter)
    try:

+ 4 - 1
slicerScripts/convertToNRRD.py

@@ -75,9 +75,11 @@ def main(configFile):
          try:
             if not xconfig['recalculate']:
                print('Entry done')
+               getData.updateStatus(db,r,xconfig,'convertToNRRD')
                continue
          except KeyError:
             print('Entry done')
+            getData.updateStatus(db,r,xconfig,'convertToNRRD')
             continue
 
          print('Forced recalculation')
@@ -88,6 +90,7 @@ def main(configFile):
       patient=loadPatient(ofb,r,xconfig)
       if not patient:
          print(f'{code} failed to load from Orthanc')
+         getData.updateStatus(db,r,xconfig,'convertToNRRD',status=False)
          continue
       #convert to nodes
       addCT(r,patient,xconfig)
@@ -117,7 +120,7 @@ def main(configFile):
       clearNodes(r,xconfig)
       #addCT and addFrames fill r['ct'] and r['spect']
       db.modifyRows('update',xconfig['project'],xconfig['schemaName'],xconfig['queryName'],[r])
-      getData.updateStatus(db,r,setup,'convertToNRRD')
+      getData.updateStatus(db,r,xconfig,'convertToNRRD')
 
       
 def clearNodes(row,xconfig):