Changeset 2038 for TI02-CSML

Timestamp:

24/01/07 14:13:17 (14 years ago)

Author:

domlowe

Message:

support for resolving FileList? Xlinks.

Location:

TI02-CSML/trunk/csml

Files:

• csmllibs/csmlxlink.py (modified) (1 diff)
• parser_extra.py (modified) (2 diffs)
• testfiles/basictest.py (modified) (2 diffs)

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

@@ -39 +39 @@
     return ds
    
+def resolveXlink(csElement, csDocument):
+    '''takes a CSML element, containing Xlinks and resolves them within the csDocument'''
+    if hasattr(csElement, 'arcrole'):
+       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 csElement.arcrole[:40]=='http://ndg.nerc.ac.uk/xlinkUsage/insert#':
+            #insert the element
+    
+    print csElement.href
+    print csElement.arcrole
+    print csElement.role
+    print csElement.show
+    
+    return csDocument

TI02-CSML/trunk/csml/parser_extra.py

@@ -7 +7 @@
 # Function to resolve references in CSML doc.
 
+import csml
 import csml.parser
 import sys
@@ -93 +94 @@
 
 class ParserPostProcessor:
-    def __init__(self,dataset):
-    #Needs rewriting for CSML v2    see V1original.
+    def __init__(self,dataset):   
+        
         self.dataset=dataset
         
+    def __findmatch(self, href):
+        for sd in csml.csmllibs.csmlextra.listify(self.dataset.storageDescriptor.descriptors):
+            if type(sd)==csml.parser.AggregatedArray:
+                for comp in csml.csmllibs.csmlextra.listify(sd.components):
+                    if hasattr(comp, 'fileList'):
+                        if hasattr(comp.fileList, 'id'):
+                            if comp.fileList.id==href:
+                                return comp.fileList
+        
+                        
+        
     def resolveReferences(self):
-        pass
-        #   return self.dataset
+        #for each xlink, call csml.csmllibs.csmlxlink.resolveXlink()
+        #start with fileLists in the the storage descriptors:
+        if hasattr(self.dataset, 'storageDescriptor'):
+            if hasattr(self.dataset.storageDescriptor, 'descriptors'):
+                for sd in csml.csmllibs.csmlextra.listify(self.dataset.storageDescriptor.descriptors):
+                    if type(sd)==csml.parser.AggregatedArray:
+                        for comp in csml.csmllibs.csmlextra.listify(sd.components):
+                            if hasattr(comp, 'fileListXLINK'):
+                                if hasattr(comp.fileListXLINK, 'href'):                                
+                                    fList = self.__findmatch(comp.fileListXLINK.href[1:])
+                                    if fList is not None:
+                                        comp.fileList =fList
+                                        del comp.fileListXLINK
+       
+        #for feature in self.dataset.featureCollection.featureMembers:
+            #if hasattr(feature.value.rangeSet, 'valueArray'):
+                ##could be an xlink here..
+                #for vc in  csml.csmllibs.csmlextra.listify(feature.value.rangeSet.valueArray.valueComponent):
+                    #if hasattr(vc, 'href'):
+                        #self.dataset=csml.csmllibs.csmlxlink.resolveXlink(vc, self.dataset)
+        #sys.exit()
+        return self.dataset

TI02-CSML/trunk/csml/testfiles/basictest.py

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