Changeset 2034 for TI02-CSML

Timestamp:

23/01/07 14:44:07 (14 years ago)

Author:

domlowe

Message:

support for fileList and xlink when creating csml

Location:

TI02-CSML/trunk/csml

Files:

• csmllibs/csmlbuilder.py (modified) (2 diffs)
• csmllibs/csmlfeaturetypes.py (modified) (1 diff)
• csmllibs/csmlxlink.py (modified) (2 diffs)
• parser.py (modified) (3 diffs)

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

@@ -27 +27 @@
         self.createFeatureCollection()
         self.createFeatures()
-        #self.insertXlinks()
+        self.insertXlinks()
         #self.closeFC()
         #self.closeDS()
@@ -107 +107 @@
                     
     def insertXlinks(self):
-        self.ds.featureCollection=csml.csmllibs.csmlxlink.createXlinks(self.ds.featureCollection)
+        self.ds=csml.csmllibs.csmlxlink.createXlinks(self.ds)
         
         

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

@@ -201 +201 @@
             varSize=csml.csmllibs.csmlextra.cleanString1(str(varSize))
             fe.arraySize=cp.csString(varSize)
-            fe.fileName=cp.csString(self.filesinDir)
+            fl=cp.FileList()
+            fl.fileNames=cp.csString(self.filesinDir)
+            fe.fileList=fl
             fe.variableName=cp.csString(varName)
             aa.components=[fe]

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

@@ +1 @@
+
 '''csmlxlink - contains functions used for processin xlinks in csml documents.
 created 23 01 2007 by Dominic Lowe, CCLRC, BADC
@@ -6 +7 @@
 import csml
 
-def createXlinks(featureCollection):
-    '''returns a featureCollection with the domains of all features reduced to xlinks to other domains where possible
-    e.g if 3 features share the same domain, the domain will be explicit in the first feature, and referenced only by xlink from the second 2 features. 
-    This function compares the domains of all the features in the featureCollection and looks for matching domains'''
-    
-    features = featureCollection.featureMembers
-    
-    #xlinkDictionary = {axislabel_axisspanned :(values, gmlid), .... }
-    #process:
-    #go through each ordinate in each domain for each feature.
-    #if ordinate (exact match with labels, span + value) is not in dictionary add it
-    #and create a new gml id.
-    #else if it is in the dictionary, get the gml id and replace the ordinate values with an xlink.
-       
-    xlinkDictionary = {}
-    for feature in features:
-        print feature.id
-        #okay, in first instance deal with GridSeries features
-        if type (feature.value) == csml.parser.GridSeriesCoverage:
-            domain = feature.value.gridSeriesDomain            
-            for gO in domain.coordTransformTable.gridOrdinates:
-                if gO.coordAxisLabel.CONTENT !='':
-                    xlinkID=gO.coordAxisLabel.CONTENT + '_' + gO.gridAxesSpanned.CONTENT    
-                    if xlinkID=='unknown_unspecified':
-                        continue
-                    if xlinkID in xlinkDictionary:
-                        #replace content with xlink TODO
-                        gmlid=xlinkDictionary[xlinkID]
-                        print gmlid
+def createXlinks(dataset):
+    '''returns a CSMLStorageDescriptor with any fileLists reduced to xlinks to other fileLists where possible.
+    e.g if 3 features share the same fileList, the fileList will be explicit in the first feature, and referenced only by xlink from the second 2 features. 
+    This function compares the fileLists of all AggregatedArrays  in the CSMLStorageDescriptor and looks for matching fileLists'''
+    ds=dataset
+    if not hasattr(ds, 'storageDescriptor'):
+        return None
+    else:
+        #xlinkDictionary = {axislabel_axisspanned :(values, gmlid), .... }
+        #process:
+        #go through each ordinate in each domain for each feature.
+        #if ordinate (exact match with labels, span + value) is not in dictionary add it
+        #and create a new gml id.
+        #else if it is in the dictionary, get the gml id and replace the ordinate values with an xlink.
+        xlinkDictionary = {}
+        for descriptor in ds.storageDescriptor.descriptors:
+            if type(descriptor)==csml.parser.AggregatedArray:
+                for comp in descriptor.components:
+                    fID=comp.fileList.fileNames.CONTENT
+                    if fID in xlinkDictionary:
+                        #replace content with xlink
+                        gmlid=xlinkDictionary[fID][1]
+                        setattr(comp, 'fileListXLINK', csml.parser.csString())
+                        comp.fileListXLINK.href='#%s'%gmlid
+                        del comp.fileList
                     else:
-                        print 'no, adding %s to dictionary'%xlinkID
-                        xlinkDictionary[xlinkID]=gO.coordAxisValues.coordinateList.CONTENT
-                        #timepositionlist alternative needed..
-                        
-                        
-            
-    sys.exit()
-    
-    
-    #return 
+                        #add to dictionary & set gml:id attribute
+                        newid=csml.csmllibs.csmlextra.getRandomID()
+                        xlinkDictionary[fID]=(fID, newid)
+                        comp.fileList.id=newid
+    return ds
+   

TI02-CSML/trunk/csml/parser.py

@@ -270 +270 @@
 
                 
-class csString(csElement):
+    
+class AbstractGML(csElement):
+    def __init__(self, **kwargs):
+        a=[GML('id'), GML('description'), GML('name'), GML('MetaDataProperty')]
+        addatts(self,a)
+
+class AssociationAttributeGroup(csElement):
+    def __init__(self, **kwargs):
+        a =[XLINK('href'),XLINK('role'), XLINK('arcrole'),XLINK('title'), XLINK('show'), XLINK('actuate')] 
+        addatts(self,a)
+
+class csString(AssociationAttributeGroup, csElement):
     def __init__(self, text=None,**kwargs):
+        #Needed so it can use xlink
+        AssociationAttributeGroup.__init__(self,**kwargs)
         if text != None:
             if type(text) is not str:
@@ -278 +291 @@
         children={}
         addchildren(self,children)
-    
-class AbstractGML(csElement):
-    def __init__(self, **kwargs):
-        a=[GML('id'), GML('description'), GML('name'), GML('MetaDataProperty')]
-        addatts(self,a)
-
-class AssociationAttributeGroup(csElement):
-    def __init__(self, **kwargs):
-        a =[XLINK('href'),XLINK('role'), XLINK('arcrole'),XLINK('title'), XLINK('show'), XLINK('actuate')] 
-        addatts(self,a)
 
 class SRSReferenceGroup(csElement):
@@ -700 +703 @@
         addchildren(self,children)
 
+class FileList(AssociationAttributeGroup,AbstractGML,csElement):
+    def __init__(self,**kwargs):
+        AssociationAttributeGroup.__init__(self,**kwargs)
+        AbstractGML.__init__(self,**kwargs)
+        addatts(self,[])
+        children= {'fileNames':[CSML('fileNames'), 'csString']}
+        addchildren(self,children)
+    
 class FileExtract(ArrayDescriptor, csElement):
     def __init__(self,**kwargs):
         ArrayDescriptor.__init__(self,**kwargs)
-        children= {'fileName':[CSML('fileName'), 'csString']}
+        children= {'fileName':[CSML('fileName'), 'csString'],  'fileList':[CSML('FileList'), 'FileList', CSML('fileList')],'fileListXLINK':[CSML('fileList'), 'csString']}
         addchildren(self,children)