Changing ofb to ofb.net for store and set routines

pythonScripts/preprocess.py

@@ -44,9 +44,6 @@ def getDicom(pars,row,zipDir,rawDir,im,imageSelector):
 
     participantField=pars.get('participantField','PatientId')
     ofb=pars['ofb']
-    if row['movedToProjectOrthanc']=='TRUE':
-      ofbStore=ofb.store()
-      ofb.set(pars['orthanc'])
     
     seriesId=row[imageSelector[im]];
     if seriesId=="0":
@@ -64,14 +61,14 @@ def getDicom(pars,row,zipDir,rawDir,im,imageSelector):
 
 #use study specific orthanc
         if row['movedToProjectOrthanc']=='TRUE':
-            ofbStore=ofb.store()
-            ofb.set(pars['orthanc'])
+            ofbStore=ofb.net.store()
+            ofb.net.set(pars['orthanc'])
    
         ofb.getZip('series',seriesId,fname)
 
 #reset to global value
         if row['movedToProjectOrthanc']=='TRUE':
-            ofb.set(ofbStore) 
+            ofb.net.set(ofbStore) 
 
 
     #unzip the zipped dicom series
@@ -153,7 +150,7 @@ def main(parameterFile):
     dicomPars={'participantField':participantField,'ofb':ofb}
 
 
-    ds=db.selectRows(project,'study','StudyProperties')
+    ds=db.selectRows(project,'study','StudyProperties',[])
     orthancObj={'server':ds['rows'][0]['orthancURL'],
       'user':ds['rows'][0]['orthancUser'],
       'password':ds['rows'][0]['orthancPassword']}
@@ -250,8 +247,7 @@ def main(parameterFile):
             #use imageSelector -> inputs
             for im in imageSelector:
                 #checks if raw files are already loaded
-                getDicom(dicomPars,row,zipDir,rawDir,im,imageSelector,\
-                    participantField)
+                getDicom(dicomPars,row,zipDir,rawDir,im,imageSelector)