Changeset 2204

Timestamp:

22/02/07 10:41:43 (14 years ago)

Author:

domlowe

Message:

resolving conflicts

Location:

TI02-CSML/trunk/csml

Files:

• Examples/Parsing/basictest.py (modified) (2 diffs)
• Examples/Parsing/demoCreateV2.py (modified) (1 diff)
• csmllibs/csmlxlink.py (modified) (1 diff)

TI02-CSML/trunk/csml/Examples/Parsing/basictest.py

@@ -14 +14 @@
 #######################################################
 # 1. Test parsing from CSML file
-tree = ElementTree(file='Examples/parsing/example.xml')
+tree = ElementTree(file='/gridseries/testout.xml')
 #tree = ElementTree(file='nagridseries.xml')
 #tree = ElementTree(file='bodc.xml')
@@ -26 +26 @@
 
 #resolve references: 
-#dataset=parser_extra.ParserPostProcessor(dataset).resolveReferences()
+dataset=parser_extra.ParserPostProcessor(dataset).resolveReferences()
 
 #This creates a new CSML document string from the CSML objects in memory.

TI02-CSML/trunk/csml/Examples/Parsing/demoCreateV2.py

@@ -4 +4 @@
 
   #########################################
-##  construction of CSML objects ##
+    ##  construction of CSML objects ##
   #########################################
 

TI02-CSML/trunk/csml/csmllibs/csmlxlink.py

@@ -44 +44 @@
        usage=csElement.arcrole.split('#')[0]
        elem=csElement.arcrole.split('#')[1]
-       if usage=='http://ndg.nerc.ac.uk/xlinkUsage/insert':
-           for child in csElement.CHILDREN:
-               print getattr(csElement, child).__class__
-               print csElement.CHILDREN
-               if getattr(csElement, child).__class__ == elem:
-                   print 'yes'
+       #if usage=='http://ndg.nerc.ac.uk/xlinkUsage/insert':
+           #for child in csElement.CHILDREN:
+               ##print getattr(csElement, child).__class__
+               ##print csElement.CHILDREN
+               #if getattr(csElement, child).__class__ == elem:
+                   #print 'yes'
     
     return csDocument