[Modeling-cvs] ProjectModeling/Modeling/tests/testPackages/StoreEmployees pymodel_StoreEmployees.py,1.1,1.2 __init__.py,1.2,1.3

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

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees
In directory sc8-pr-cvs1:/tmp/cvs-serv7471/ProjectModeling/Modeling/tests/testPackages/StoreEmployees

Modified Files:
	__init__.py 
Added Files:
	pymodel_StoreEmployees.py 
Log Message:
Merged branch brch-0_9pre7-1-PyModel. Introducing: ability to express models
in plain python rather than in xml files.
See CHANGES for details.



Index: __init__.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	21 Aug 2002 18:40:17 -0000	1.2
--- __init__.py	7 Jul 2003 14:57:15 -0000	1.3
***************
*** 1,36 ****
  # Load the model
  
! from Modeling import ModelSet
! import os, warnings, StringIO, traceback
! from model_StoreEmployees import model_src
! try:
!   if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
!     ModelSet.defaultModelSet().addModelFromXML({'string': model_src})
!     model=ModelSet.defaultModelSet().modelNamed('StoreEmployees')
! except:
!   exc=StringIO.StringIO()
!   traceback.print_exc(file=exc)
!   warnings.warn("Couldn't load model 'model_StoreEmployees.xml'\nReason:\n%s"%exc.getvalue())
!   del exc
  
! del os, warnings, StringIO, traceback, model_src
  
! # Or, alternatively: use the xml file (ok for dev. mode, not for install w/
! # distutils)
! #
! # from Modeling import ModelSet
! # import os, warnings, StringIO, traceback
! # try:
! #   if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
! #     from os import getcwd, path
! #     mydir = os.path.abspath(os.path.dirname(__file__))
! #     xmlmodelPath=path.join(mydir,'model_StoreEmployees.xml')
! #     ModelSet.defaultModelSet().addModelFromXML({'file': xmlmodelPath})
! #     model=ModelSet.defaultModelSet().modelNamed('StoreEmployees')
! # except:
! #   exc=StringIO.StringIO()
! #   traceback.print_exc(file=exc)
! #   warnings.warn("Couldn't load model 'model_StoreEmployees.xml'\nReason:\n%s"%exc.getvalue())
! #   del exc
! # 
! # del os, warnings, StringIO, traceback
--- 1,14 ----
  # Load the model
  
! from Modeling import ModelSet, Model
  
! if ModelSet.defaultModelSet().modelNamed("StoreEmployees") is None:
!   import os
!   mydir = os.path.abspath(os.path.dirname(__file__))
!   model=Model.searchModel('StoreEmployees', mydir, verbose=0)
  
!   if not model:
!     import warnings
!     warnings.warn("Couldn't load model 'StoreEmployees'")
!   else:
!     ModelSet.defaultModelSet().addModel(model)