[Zapp-cvs-commit] ZApp ZApp_Base.py,1.18,1.19 ZApp_CMFBase.py,1.7,1.8 ZApp_MiscData.py,1.11,1.12 ZApp_Specialist.py,1.26,1.27 __init__.py,1.13,1.14

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp
In directory sc8-pr-cvs1:/tmp/cvs-serv14999

Modified Files:
	ZApp_Base.py ZApp_CMFBase.py ZApp_MiscData.py 
	ZApp_Specialist.py __init__.py 
Log Message:
added some skins to ZApp CMF core.. 

Index: ZApp_Base.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Base.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ZApp_Base.py	20 Jun 2003 11:23:18 -0000	1.18
--- ZApp_Base.py	25 Jun 2003 11:45:53 -0000	1.19
***************
*** 15,18 ****
--- 15,20 ----
  from Products.ZPatterns.SkinScript.Components import Trigger, Compute
  from ZApp_LOG import ZApp_LOG
+ import ZApp_Application
+ 
  from Products.ZPatterns.DataSkins import _v_dm_
  from Products.ZPatterns.SheetProviders import  SheetProvider
***************
*** 97,101 ****
      lever_object_type = 'Lever Property Collection'
  
!     def __init__(self, collection=None, prop_default='', type_default='string', size_default=30 ):
  
          self.prop_default = prop_default
--- 99,103 ----
      lever_object_type = 'Lever Property Collection'
  
!     def __init__(self, collection=None, prop_default='', type_default='string', size_default=30, pkey_size=50 ):
  
          self.prop_default = prop_default
***************
*** 231,242 ****
  
          currObject = self
-         app_meta = self.applicationMetaType
  
          while 1:
!             if not currObject:
!                 raise RuntimeError, "Hmm. that doesn't make any sense!.. there is no application!"
              
!             if currObject.meta_type == app_meta:
                  break
  
              currObject = currObject.aq_parent
--- 233,250 ----
  
          currObject = self
  
          while 1:
!             if (not currObject) or (not hasattr(currObject, 'meta_type')):
!                 raise RuntimeError, "Hmm. thaf's odd.. I can't find any ZApp Application here!"
              
!             if currObject.meta_type == ZApp_Application.ZApp_Application.meta_type:
                  break
+ 
+             if hasattr(currObject, 'objectIds') and currObject.objectIds( ZApp_Application.ZApp_Application.meta_type ):
+                 apps = currObject.objectValues( ZApp_Application.ZApp_Application.meta_type )
+                 result = apps and apps[0]
+                 if result:
+                     currObject = result
+                     break
  
              currObject = currObject.aq_parent

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ZApp_CMFBase.py	13 Jun 2003 13:59:53 -0000	1.7
--- ZApp_CMFBase.py	25 Jun 2003 11:45:53 -0000	1.8
***************
*** 25,28 ****
--- 25,29 ----
      meta_type = 'ZApp CMF Content Type'
      zapp_cmf_type = 1
+     _primaryKeyStringSize=255  # allow for a pretty rediculous size... 
  
      __implements__ = ( PortalContent.__implements__

Index: ZApp_MiscData.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_MiscData.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ZApp_MiscData.py	20 Jun 2003 11:23:18 -0000	1.11
--- ZApp_MiscData.py	25 Jun 2003 11:45:53 -0000	1.12
***************
*** 25,29 ****
      [lprop(id='Manager'),
       lprop(id='objectID'),
!      lprop(id='dataType'),
       lprop(id='xml', prop_type='text', dbType='text'),
       ]
--- 25,29 ----
      [lprop(id='Manager'),
       lprop(id='objectID'),
!      lprop(id='dataType', dbSize=100),
       lprop(id='xml', prop_type='text', dbType='text'),
       ]
***************
*** 105,109 ****
      def setXMLAttr(self, attr, value):
          """ set an XML attribute to a value."""
!         selt._setXMLAttr( attr, value)
          self.buildXML()
  
--- 105,109 ----
      def setXMLAttr(self, attr, value):
          """ set an XML attribute to a value."""
!         self._setXMLAttr( attr, value)
          self.buildXML()
  

Index: ZApp_Specialist.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Specialist.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ZApp_Specialist.py	20 Jun 2003 04:15:08 -0000	1.26
--- ZApp_Specialist.py	25 Jun 2003 11:45:53 -0000	1.27
***************
*** 399,407 ****
          return self.ZApp_getItemClassAttr('_primaryKeyGenerator')
  
!     def ZApp_getItemClassAttr(self, attr):
          """
          Return the class for objects managed by this ZApp_Specialist.
          """
!         return self.defaultRack.getKlassAttr( attr )
  
  
--- 399,419 ----
          return self.ZApp_getItemClassAttr('_primaryKeyGenerator')
  
!     def ZApp_getDefaultStringSize(self):
!         """
!         return a default string size for dbSize... 
!         """
!         return self.ZApp_getItemClassAttr('_defaultStringSize',30)
! 
!     def ZApp_getPrimaryKeySize(self):
!         """
!         return a default string size for dbSize... 
!         """
!         return self.ZApp_getItemClassAttr('_primaryKeyStringSize',40)
! 
!     def ZApp_getItemClassAttr(self, attr, default=None):
          """
          Return the class for objects managed by this ZApp_Specialist.
          """
!         return self.defaultRack.getKlassAttr( attr, default )
  
  

Index: __init__.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/__init__.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** __init__.py	18 Jun 2003 19:11:19 -0000	1.13
--- __init__.py	25 Jun 2003 11:45:53 -0000	1.14
***************
*** 61,65 ****
      context.registerHelp()
      context.registerHelpTitle('ZApp Help')
!     
      
  if __name__=='__main__':
--- 61,70 ----
      context.registerHelp()
      context.registerHelpTitle('ZApp Help')
! 
! 
! from Products.CMFCore.DirectoryView import registerDirectory
! registerDirectory('skins', globals())
! 
! zapp_globals = globals()
      
  if __name__=='__main__':