source: issm/oecreview/Archive/19101-20495/ISSM-19569-19570.diff

Index: ../trunk-jpl/src/m/classes/organizer.py
===================================================================
--- ../trunk-jpl/src/m/classes/organizer.py     (revision 19569)
+++ ../trunk-jpl/src/m/classes/organizer.py     (revision 19570)
@@ -97,12 +97,16 @@
                #Get model path
                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')
+               path1=os.path.join(self.repository,self.prefix+'.step#'+string+'.python')
+               path2=os.path.join(self.repository,string)
 
                #figure out if the model is there, otherwise, we have to use the default path supplied by user.
-               if whichdb(path):
-                       md=loadmodel(path)
+               if whichdb(path1):
+                       md=loadmodel(path1)
                        return md
+                elif whichdb(path2):
+                        md=loadmodel(path2)
+                        return md
 
                #If we are here, the model has not been found. Try trunk prefix if provided
                if self.trunkprefix:
@@ -114,7 +118,7 @@
                                md=loadmodel(path2)
                                return md
                else:
-                       raise IOError("Could not find '%s'" % path)
+                       raise IOError("Could not find '%s'" % path1)
        #}}}
        def perform(self,string):    # {{{