[Zapp-cvs-commit] ZApp ZApp_MiscData.py,1.22,1.23

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

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

Modified Files:
	ZApp_MiscData.py 
Log Message:
fixed up for IADC

Index: ZApp_MiscData.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_MiscData.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ZApp_MiscData.py	4 Dec 2003 22:25:59 -0000	1.22
--- ZApp_MiscData.py	31 Dec 2003 18:04:21 -0000	1.23
***************
*** 92,95 ****
--- 92,99 ----
              
          d[attr] = value
+ 
+     def _clearXMLAttrs(self):
+         self._v_xmlDict = {}
+         self.buildXML()
          
      def setXMLAttr(self, attr, value):
***************
*** 98,103 ****
          self.buildXML()
  
!     def setXMLAttrs(self, dict=None, **kw):
!         """ set some XML attributes based on a dictionary."""
  
          saveDict = {}
--- 102,111 ----
          self.buildXML()
  
!     def setXMLAttrs(self, dict=None, zapp_misc_data_clear=0, **kw):
!         """
!         set some XML attributes based on a dictionary.
! 
!         if zapp_misc_data_clear is true, clear out any existing data in stored xml.
!         """
  
          saveDict = {}
***************
*** 108,111 ****
--- 116,122 ----
              saveDict.update(dict)
  
+         if zapp_misc_data_clear:
+             self._clearXMLAttrs()
+             
          d = self._v_xmlDict # getting _v_xmlDict insures the cache is setup
          
***************
*** 180,184 ****
          return mds
  
!     def getMiscData(self, Manager=None, dataType=''):
          """
          Get MiscData object associated with this object/Manager/dataType combination..
--- 191,195 ----
          return mds
  
!     def getMiscData(self, Manager=None, dataType='', createIfNone=0):
          """
          Get MiscData object associated with this object/Manager/dataType combination..
***************
*** 188,191 ****
--- 199,203 ----
          localmdmKey = Manager + ":" + dataType
          mdm = self._v_MyMDMCache.get(localmdmKey, missing)
+         mdResult = None
  
          if mdm is missing:
***************
*** 193,200 ****
              for aBag in mds.ZApp_getItems( objectID = self.getMiscObjectID(), Manager = Manager):
                  if aBag.dataType == dataType:
!                     mdm = aBag
                      break
  
!         return mdm or None
  
      def setupMiscData(self, Manager=None, dataType='', checked=0):
--- 205,215 ----
              for aBag in mds.ZApp_getItems( objectID = self.getMiscObjectID(), Manager = Manager):
                  if aBag.dataType == dataType:
!                     mdResult = aBag
                      break
  
!             if createIfNone and (mdResult is None):
!                 mdResult = self.setupMiscData( Manager, dataType, checked=1)
! 
!         return mdResult or None
  
      def setupMiscData(self, Manager=None, dataType='', checked=0):