Changeset 16109

Timestamp:

09/08/13 20:08:56 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issue with organizer and databases

File:

• issm/trunk-jpl/src/m/classes/organizer.py (modified) (6 diffs)

issm/trunk-jpl/src/m/classes/organizer.py

@@ -6 +6 @@
 from savevars import *
 from model import model
+from whichdb import whichdb
 
 class organizer(object):
@@ -28 +29 @@
                 self.repository    ='./'
                 self.prefix        ='model.'
-                self.extension        ='' #default extension of python to save models.
                 self.trunkprefix   =''
                 self.steps         =[]
@@ -55 +55 @@
                 self.requestedsteps=options.getfieldvalue('steps',[0])
                 
-                #Get extension
-                self.extension=options.getfieldvalue('extension','')
-
                 #Get trunk prefix (only if provided by user)
                 if options.exist('trunkprefix'):
@@ -72 +69 @@
                 s+="%s\n" % "   Repository: '%s'" % self.repository
                 s+="%s\n" % "   Prefix:     '%s'" % self.prefix
-                s+="%s\n" % "   Extension:     '%s'" % self.extension
                 if not self.steps:
                         s+="%s\n" % "   no step"
@@ -101 +97 @@
                 if not isinstance(string,(str,unicode)):
                         raise TypeError("argument provided is not a string")
-                path=os.path.join(self.repository,self.prefix+'.step#'+string+'.python'+self.extension)
+                path=os.path.join(self.repository,self.prefix+'.step#'+string+'.python')
 
                 #figure out if the model is there, otherwise, we have to use the default path supplied by user.
-                if os.path.exists(path):
+                if whichdb(path):
                         md=loadmodel(path)
                         return md
@@ -110 +106 @@
                 #If we are here, the model has not been found. Try trunk prefix if provided
                 if self.trunkprefix:
-                        path2=os.path.join(self.repository,self.trunkprefix+string+self.extension)
+                        path2=os.path.join(self.repository,self.trunkprefix+string)
                         if not os.path.exists(path2):
                                 raise IOError("Could find neither '%s' nor '%s'" % (path,path2))