Webware for Python

Update of /cvsroot/webware/Webware/MiddleKit/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18927/Core

Modified Files:
	Model.py ModelUser.py 
Log Message:
- split obj ref SQL columns in two (class id and obj id)
- merge SQLGenerater.config into Settings.config
- see release notes for details


Index: Model.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Core/Model.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Model.py	16 Feb 2004 22:14:52 -0000	1.22
--- Model.py	24 Feb 2004 02:04:13 -0000	1.23
***************
*** 322,324 ****
--- 322,332 ----
  		return {
  			'Threaded': 1,
+ 			'ObjRefSuffixes': ('ClassId', 'ObjId'),
+ 			'UseBigIntObjRefColumns': False,
+ #			'SQLLog': { 'File': 'stdout', },
+ 			'PreSQL': '',
+ 			'PostSQL': '',
+ 			'DropStatements': 'database',  # database, tables
+ 			'ExternalEnumsTableName': None, # '%(ClassName)s%(AttrName)sEnum'
+ 			'ExternalEnumsColumnName': 'name',  # could use %(ClassName)s and %(AttrName)s
  		}

Index: ModelUser.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Core/ModelUser.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ModelUser.py	20 Jun 2002 17:47:44 -0000	1.4
--- ModelUser.py	24 Feb 2004 02:04:13 -0000	1.5
***************
*** 1,24 ****
- from MiscUtils.Configurable import Configurable
  from MiscUtils.MixIn import MixIn
  import sys
  from types import *
  
  
! class ModelUser(Configurable):
  
  	## Init ##
  
  	def __init__(self):
- 		Configurable.__init__(self)
  		self._model = None
  
  
! 	## Configuration ##
! 
! 	def configFilename(self):
! 		return self.name() + '.config'
  
! 	def defaultConfig(self):
! 		return {}
  
  
--- 1,24 ----
  from MiscUtils.MixIn import MixIn
+ from MiscUtils import NoDefault
  import sys
  from types import *
  
  
! class ModelUser:
  
  	## Init ##
  
  	def __init__(self):
  		self._model = None
  
  
! 	## Settings ##
  
! 	def setting(self, name, default=NoDefault):
! 		"""
! 		Returns the given setting which is actually just taken from
! 		the model.
! 		"""
! 		return self._model.setting(name, default)
  
  
***************
*** 96,100 ****
  		and potentially customize the behavior, including
  		providing more debugging information.
! 		
  		This implementation writes the msg to stdout.
  		"""
--- 96,100 ----
  		and potentially customize the behavior, including
  		providing more debugging information.
! 
  		This implementation writes the msg to stdout.
  		"""