Changeset 2684

Timestamp:

02/07/07 15:49:30 (14 years ago)

Author:

domlowe

Message:

tweaks to speed up parsing

File:

• TI02-CSML/trunk/csml/parser.py (modified) (9 diffs)

TI02-CSML/trunk/csml/parser.py

@@ -56 +56 @@
     ''' merges (adds) dictionary to existing self.CHILDREN dictionary '''
     dict1 = dict
-    if hasattr(obj, 'CHILDREN'):
+    if 'CHILDREN' in obj.__dict__:
       dict2=obj.CHILDREN
     else:
@@ -70 +70 @@
 def addatts(obj, atts):
   ''' merges self.ATTRIBUTES  of inherited classes'''
-  if hasattr(obj, 'ATTRIBUTES'):
+  if 'ATTRIBUTES' in obj.__dict__:
     for att in atts:
         obj.ATTRIBUTES.append(att)
@@ -81 +81 @@
 def addelems(obj, elems):
   ''' merges self.elems of inherited classes'''
-  if hasattr(obj, 'ELEMORDER'):
+  if 'ELEMORDER' in obj.__dict__:
     for elem in elems:
         obj.ELEMORDER.append(elem)
@@ -90 +90 @@
 #Some variable definitions: these things are often repeated so store in variables.
 FILEFORMATS=[CSML('NetCDFExtract'),CSML('NASAAmesExtract'), CSML('GRIBExtract'),CSML('CDMLExtract'), CSML('RawFileExtract'), CSML('ImageFileExtract'), CSML('AggregatedArray')]
-
 
 class csElement(object):
@@ -112 +111 @@
         
     def __setattr__(self, name, value):
-        if hasattr(self, CSML(name)):
+        if CSML(name) in self.__dict__:
             object.__setattr__(self, CSML(name), value)
             object.__setattr__(self, name, value)
-        elif hasattr(self,GML(name)):
+        elif GML(name) in self.__dict__:       
             object.__setattr__(self, GML(name), value)
             object.__setattr__(self, name, value)
-        elif hasattr(self,XLINK(name)):
+        elif XLINK(name) in self.__dict__:       
             object.__setattr__(self, XLINK(name), value)
-            object.__setattr__(self, name, value)
+            object.__setattr__(self, name, value) 
         else:
-            if hasattr(self, 'ATTRIBUTES'):
+            if 'ATTRIBUTES' in self.__dict__:
                 if CSML(name) in self.__dict__['ATTRIBUTES']:
                     object.__setattr__(self, CSML(name), value)
@@ -173 +172 @@
     def addChildElem(self, childname, childobj):
         #sometimes you want to add a child element but don't know if there is one already. In which case you want to create a list of child objects.
-        if hasattr(self, childname):
+        if childname in self.__dict__:
             currentattribute=getattr(self,childname)
             if type(getattr(self,childname)) is list:
@@ -186 +185 @@
     def toXML(self, csmlfrag, **kwargs):
         #process self and convert to XML      
-        if hasattr(self, 'CONTENT'):
+        if 'CONTENT' in self.__dict__:
             if self.CONTENT is not None: csmlfrag.text=self.CONTENT
-        if hasattr(self, 'ATTRIBUTES'):
+        if 'ATTRIBUTES' in self.__dict__:
             for item in self.__dict__:
                 if item in self.ATTRIBUTES:                    
@@ -277 +276 @@
                                     childobj.fromXML(frag)
                                 #set this object to be an attribute of the 'parent' (self) object
-                                if hasattr(self, child):
+                                if child in self.__dict__:
                                     if type(self.__dict__[child]) is not list:
                                         tmp=self.__dict__[child]
@@ -300 +299 @@
                             
                         #set this object to be an attribute of the 'parent' (self) object
-                        if hasattr(self, child):
+                        if child in self.__dict__:
                             if type(self.__dict__[child]) is not list:
                                 tmp=self.__dict__[child]