Changeset 2029

Timestamp:

23/01/07 11:27:53 (14 years ago)

Author:

domlowe

Message:

adding csmlxlink.py and related xlink code

Location:

TI02-CSML/trunk/csml/csmllibs

Files:

• __init__.py (modified) (1 diff)
• csmlbuilder.py (modified) (2 diffs)
• csmlfeaturetypes.py (modified) (4 diffs)
• csmlxlink.py (added)

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

@@ -12 +12 @@
 import csmlfeaturewrap
 import csmlcrs
+import csmlxlink
 

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

@@ -27 +27 @@
         self.createFeatureCollection()
         self.createFeatures()
+        self.insertXlinks()
         #self.closeFC()
         #self.closeDS()
@@ -105 +106 @@
 
                     
+    def insertXlinks(self):
+        self.ds.featureCollection=csml.csmllibs.csmlxlink.createXlinks(self.ds.featureCollection)
+        
+        
     def saveFile(self):
         print "Creating CSML document and saving file"

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

@@ -114 +114 @@
             ord=cp.GridOrdinateDescription()                
             #map the grid axis to the crs axis
+            #default to empty element
+            ord.coordAxisLabel=cp.csString('')
+            ord.gridAxesSpanned=cp.csString('')
             for axis in axisorder:
                 if axisorder[axis]==dimName[0]:
@@ -206 +209 @@
             else:
                 self.ds_element.fileExtracts=[aa]
-        va=csml.parser.ValueArray()
-        vc=csml.parser.ValueComponent()
-        vc.href='linktoaggregatedarray'
-        vc.arcrole="http://ndg.nerc.ac.uk/xlinkUsage/insert#QuantityList"
-        vc.role="http://ndg.nerc.ac.uk/fileFormat/csmlStorageDescriptor"
-        vc.show='embed'
-        ql=csml.parser.MeasureOrNullList()
-        ql.uom=strUom
-        vc.quantityList=ql
-        va.valueComponent=vc
-        rs.valueArray=va
+            rs.aggregatedArray=aa
+        #va=csml.parser.ValueArray()
+        #vc=csml.parser.ValueComponent()
+        #vc.href='linktoaggregatedarray'
+        #vc.arcrole="http://ndg.nerc.ac.uk/xlinkUsage/insert#QuantityList"
+        #vc.role="http://ndg.nerc.ac.uk/fileFormat/csmlStorageDescriptor"
+        #vc.show='embed'
+        #ql=csml.parser.MeasureOrNullList()
+        #ql.uom=strUom
+        #vc.quantityList=ql
+        #va.valueComponent=vc
+        #rs.valueArray=va
         return rs
     
@@ -236 +240 @@
                 gsFeature=cp.GridSeriesFeature()
                 self.__featureMetadata(gsFeature,allVarNames[i])
-                
                 #VALUE (coverage)
                 gsCoverage=cp.GridSeriesCoverage()
@@ -264 +267 @@
     ###End of createCSMLGridSeriesFeatures###
 
+
+
+        #BELOW THIS POINT ALL NEEDS REWRITING
+####################################
     def createCSMLPointSeriesFeatures(self): 
-        #NEEDS REWRITING
+
         representativeFiles=self.ffmap.getRepresentativeFiles()
         for repfile in representativeFiles: