Changeset 2015

Timestamp:

17/01/07 14:52:51 (13 years ago)

Author:

domlowe

Message:

addition of random ids, changes related to xlink and rangeset

Location:

TI02-CSML/trunk/csml

Files:

• XMLInstances/CSMLExample_Wrapped2.xml (modified) (1 diff)
• csmllibs/csmlfeaturetypes.py (modified) (1 diff)
• csmllibs/csmlfileextracts.py (modified) (2 diffs)
• parser.py (modified) (1 diff)

TI02-CSML/trunk/csml/XMLInstances/CSMLExample_Wrapped2.xml

@@ -263 +263 @@
                                 <GridSeriesCoverage gml:id="COAPEC-temp_2-coverage">
                                         <gridSeriesDomain xlink:href="COAPEC-domain-xypt-1"/>
-                                        <gml:rangeSet>
-                                                <gml:ValueArray gml:id="COAPEC-temp_2-coverage-range">
-                                                        <gml:valueComponent xlink:arcrole="http://ndg.nerc.ac.uk/xlinkUsage/insert#QuantityList" xlink:href="CSMLStorageDescriptorExample.xml#coapec_temp_2" xlink:role="http://ndg.nerc.ac.uk/fileFormat/csmlStorageDescriptor" xlink:show="embed">
-                                                                <gml:QuantityList uom="ndg:uom:K"/>
-                                                        </gml:valueComponent>
-                                                </gml:ValueArray>
+                                        <gml:rangeSet  xlink:arcrole="http://ndg.nerc.ac.uk/xlinkUsage/insert#QuantityList" xlink:href="CSMLStorageDescriptorExample.xml#coapec_temp_2" xlink:role="http://ndg.nerc.ac.uk/fileFormat/csmlStorageDescriptor" xlink:show="embed">
+                                                <gml:QuantityList uom="ndg:uom:K"/>
                                         </gml:rangeSet>
                                 </GridSeriesCoverage>

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

@@ -215 +215 @@
                     else:
                         self.ds_element.fileExtracts=[aa]
-                    #rs.aggregatedArray=aa
                 rs.href='linktoaggregatedarray'
-                gsCoverage.rangeSet=rs              
+                rs.arcrole="http://ndg.nerc.ac.uk/xlinkUsage/insert#QuantityList"
+                rs.role="http://ndg.nerc.ac.uk/fileFormat/csmlStorageDescriptor"
+                rs.show='embed'
+                ql=csml.parser.MeasureOrNullList()
+                ql.uom=strUom
+                rs.quantityList=ql
+                gsCoverage.rangeSet=rs
                 gsFeature.parameter=csml.parser.Phenomenon(href='http://badc.rl.ac.uk/localparams#%s'%allVarNames[i])
                 gsFeature.value=gsCoverage
+                
                 self.fms.append(gsFeature)
             DI.closeFile()

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

@@ -41 +41 @@
                     arrayDescriptor=csml.parser.PPExtract()
                 #print self.extractType
-                arrayDescriptor.id=str(self.extractPrefix+allDimNames[j])
-    
+                rndID=csml.csmllibs.csmlextra.getRandomID()
+                #arrayDescriptor.id=str(self.extractPrefix+allDimNames[j])
+                arrayDescriptor.id=str(rndID)
                 #SET variableName attribute of file extract
                 arrayDescriptor.variableName=csml.parser.csString(allDimNames[j])
@@ -57 +58 @@
     #                   #keep record of extracts/filenames/variables in dictionary
                 idstr = filename + allDimNames[j]
-                self.fileExtractDictionary[idstr] = self.extractPrefix+allDimNames[j]
+                self.fileExtractDictionary[idstr] = rndID#self.extractPrefix+allDimNames[j]
                 adlist.append(arrayDescriptor)
             DI.closeFile()      

TI02-CSML/trunk/csml/parser.py

@@ -349 +349 @@
         children={}
         addchildren(self,children)
+        a =['uom'] 
+        addatts(self,a)
         
 class CompositeValue(AbstractGML,csElement):