Changeset 1761 for ZMS/trunk/_builder.py

Timestamp:

12.12.2011 21:54:06 (5 months ago)

Author:

zmsdev

Message:

applied minor performance-fixes (2)

File:

• ZMS/trunk/_builder.py (modified) (7 diffs)

ZMS/trunk/_builder.py

@@ -135 +135 @@
         
         #### parsing ####
-        if _globals.debug( self):
-          _globals.writeLog( self, "#### parsing ####")
+        _globals.writeLog( self, "#### parsing ####")
         if type(input) is str:
           # input is a string!
@@ -176 +175 @@
     def OnStartElement(self, name, attrs):
         """ Builder.OnStartElement """
-        if _globals.debug( self): 
-          _globals.writeLog( self, "[Builder.OnStartElement(" + str(name) + ")]")
-          
+        _globals.writeLog( self, "[Builder.OnStartElement(" + str(name) + ")]")
+        
         name = _globals.unencode( name)
         attrs = _globals.unencode( attrs)
@@ -193 +191 @@
             self.dGlobalAttrs[name]['obj_class'] is not None):
             
-            if _globals.debug( self):
-              _globals.writeLog( self, "[Builder.OnStartElement]: " + \
+            _globals.writeLog( self, "[Builder.OnStartElement]: " + \
                 "We are inside the XML root tag OR no root object is set" + \
                 "-> instanciate node object in any case")
@@ -250 +247 @@
                     newNode.setObjProperty('change_dt',time.time(),lang)
                 
-                if _globals.debug( self):
-                  _globals.writeLog( self, "[Builder.OnStartElement]: object with id " + str(newNode.id) + " of class " + str(newNode.__class__) + " created in " + str(self.oCurrNode.__class__))
+                _globals.writeLog( self, "[Builder.OnStartElement]: object with id " + str(newNode.id) + " of class " + str(newNode.__class__) + " created in " + str(self.oCurrNode.__class__))
                 
                 if self.oRoot is None:   # root object set?
@@ -271 +267 @@
                     if self._unknownTagName == None:
                         self._unknownTagName = name
-                    if _globals.debug( self):
-                      _globals.writeLog( self, "[Builder.OnStartElement]: Unknown start-tag (" + name + "): current object did not accept tag!")  # current object did not accept tag!
+                    _globals.writeLog( self, "[Builder.OnStartElement]: Unknown start-tag (" + name + "): current object did not accept tag!")  # current object did not accept tag!
                     # raise ParseError("Unknown start-tag (" + name + "): current object did not accept tag!")  # current object did not accept tag!
           
         else:
-            if _globals.debug( self):
-              _globals.writeLog( self, "[Builder.OnStartElement]: " + 
+            _globals.writeLog( self, "[Builder.OnStartElement]: " + 
                 "we have encountered the XML root tag and a root object is predefined" + \
                 "-> simply notify root object")
@@ -301 +295 @@
     def OnEndElement(self, name):
         """ Builder.OnEndElement """
-        if _globals.debug( self): 
-          _globals.writeLog( self, "[Builder.OnEndElement(" + str(name) + ")]")
+        _globals.writeLog( self, "[Builder.OnEndElement(" + str(name) + ")]")
         
         # do we have a current node?
@@ -352 +345 @@
     def OnCharacterData(self, data):
         """ Builder.OnCharacterData """
-        if _globals.debug( self):
-          _globals.writeLog( self, "[Builder.OnCharacterData]")
+        _globals.writeLog( self, "[Builder.OnCharacterData]")
         
         # do we have a current node?