[Modeling-cvs] ProjectModeling/Modeling/ModelMasons/Python_bricks init.tmpl,1.5,1.5.2.1

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/ModelMasons/Python_bricks
In directory sc8-pr-cvs1:/tmp/cvs-serv11080/ModelMasons/Python_bricks

Modified Files:
      Tag: brch-0_9pre7-1-PyModel
	init.tmpl 
Log Message:
Adapted init.tmpl to use the new Model.searchModel()

Index: init.tmpl
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/ModelMasons/Python_bricks/init.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** init.tmpl	25 Apr 2003 18:39:13 -0000	1.5
--- init.tmpl	7 Jul 2003 11:50:06 -0000	1.5.2.1
***************
*** 3,61 ****
  # Load the model
  
! #---------------------------------------
! def loadModel():
!   """Load model from either the pickled model created by mdl_compile_model.py
!   or from the string stored in model_$(model_name).model_src
  
!   The module containing the pickled model is usually generated with the
!   script mdl_compile_model.py
  
!   Simply returns if a model named "$model_name" has already been loaded
!   """
!   from Modeling import ModelSet
!   import os, warnings, cStringIO, traceback
!   if ModelSet.defaultModelSet().modelNamed("$(model_name)") is not None:
!     return
!   try:
!     from model_$(model_name)_pickle import model_pickle
!     import cPickle
!     m=cPickle.loads(model_pickle)
!     ModelSet.defaultModelSet().addModel(m)
!     model=ModelSet.defaultModelSet().modelNamed("$(model_name)")
!   except:
!     exc=cStringIO.StringIO()
!     traceback.print_exc(file=exc)
!     warnings.warn("Couldn't load model from pickle'\n"\
!                   "Reason:\n%s"%exc.getvalue())
!     del exc
    else:
!     return
!     
!   try:
!     from model_$(model_name) import model_src
!     ModelSet.defaultModelSet().addModelFromXML({'string': model_src})
!     model=ModelSet.defaultModelSet().modelNamed("$(model_name)")
!   except:
!     exc=cStringIO.StringIO()
!     traceback.print_exc(file=exc)
!     warnings.warn("Couldn't load model 'model_$(model_name).xml'\nReason:\n%s"%exc.getvalue())
!     del exc
!   
!   # Or, alternatively: use the xml file (ok for dev. mode, not for install w/
!   # distutils)
!   #
!   # try:
!   #   from os import getcwd, path
!   #   mydir = os.path.abspath(os.path.dirname(__file__))
!   #   xmlmodelPath=path.join(mydir,'model_$(model_name).xml')
!   #   ModelSet.defaultModelSet().addModelFromXML({'file': xmlmodelPath})
!   #   model=ModelSet.defaultModelSet().modelNamed('$(model_name)')
!   # except:
!   #   exc=cStringIO.StringIO()
!   #   traceback.print_exc(file=exc)
!   #   warnings.warn("Couldn't load model 'model_$(model_name).xml'\nReason:\n%s"%exc.getvalue())
!   #   del exc
!   # 
!   # del os, warnings, StringIO, traceback
! #---------------------------------------
! loadModel()
--- 3,16 ----
  # Load the model
  
! from Modeling import ModelSet, Model
  
! if ModelSet.defaultModelSet().modelNamed("$(model_name)") is None:
!   import os
!   mydir = os.path.abspath(os.path.dirname(__file__))
!   model=Model.searchModel('$(model_name)', mydir, verbose=0)
  
!   if not model:
!     import warnings
!     warnings.warn("Couldn't load model '$(model_name)'")
    else:
!     ModelSet.defaultModelSet().addModel(model)