Changeset 16100

Timestamp:

09/06/13 13:24:15 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issue with database extension name

File:

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

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

@@ -28 +28 @@
                 self.repository    ='./'
                 self.prefix        ='model.'
+                self.extension        ='' #default extension of python to save models.
                 self.trunkprefix   =''
                 self.steps         =[]
@@ -53 +54 @@
                 #Get steps
                 self.requestedsteps=options.getfieldvalue('steps',[0])
+                
+                #Get extension
+                self.extension=options.getfieldvalue('extension','')
 
                 #Get trunk prefix (only if provided by user)
@@ -68 +72 @@
                 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"
@@ -96 +101 @@
                 if not isinstance(string,(str,unicode)):
                         raise TypeError("argument provided is not a string")
-                path=os.path.join(self.repository,self.prefix+'.step#'+string+'.db')
+                path=os.path.join(self.repository,self.prefix+'.step#'+string+'.python'+self.extension)
 
                 #figure out if the model is there, otherwise, we have to use the default path supplied by user.
@@ -105 +110 @@
                 #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)
+                        path2=os.path.join(self.repository,self.trunkprefix+string+self.extension)
                         if not os.path.exists(path2):
                                 raise IOError("Could find neither '%s' nor '%s'" % (path,path2))
@@ -157 +162 @@
                         raise RuntimeError("Cannot save model because organizer (org) is not up to date!")
 
-                name=os.path.join(self.repository,self.prefix+'.step#'+self.steps[self._currentstep-1]['string'])
+                name=os.path.join(self.repository,self.prefix+'.step#'+self.steps[self._currentstep-1]['string']+'.python')
                 print "saving model as: '%s'" % name