Changeset 4431

Timestamp:

17/11/08 13:08:52 (11 years ago)

Author:

domlowe

Message:

prototype support for attributes in getpropertyvalue method - need to check with ogc.

Location:

cows/trunk/cows

Files:

• pylons/wfs_controller.py (modified) (1 diff)
• service/imps/csmlbackend/wfs_csmlstoredqueries.py (modified) (3 diffs)

cows/trunk/cows/pylons/wfs_controller.py

@@ -161 +161 @@
         a set of wfs:members containing property values expressed in the xpath"""
         resultset=[]        
-        for feature in features:
-            featureXML=feature._feature.elem #the underlying XML
-            valuecomponent=featureXML.find(xpath)
-            if valuecomponent is not None:
-                valstr=etree.tostring(valuecomponent)           
-                resultset.append(valstr)
+        #if xpath is looking for an attribute, handle it differently - this should be unnecessary when migrated to element tree 1.3
+        #i.e. if of the form /somepath/path[@attribute]
+        attstart=xpath.find('[')
+        if attstart == -1: #no attribute            
+            for feature in features:
+                featureXML=feature._feature.elem #the underlying XML
+                valuecomponent=featureXML.find(xpath)
+                if valuecomponent is not None:
+                    valstr=etree.tostring(valuecomponent)           
+                    resultset.append(valstr)
+        else:
+            #there is an attribute:
+            attributeName=xpath.split('[')[1][1:-1]
+            xpath=xpath.split('[')[0]
+            for feature in features:
+                featureXML=feature._feature.elem #the underlying XML
+                log.debug('xpath path %s'%xpath)
+                log.debug('attribute %s'%attributeName)
+                if len(xpath) ==0:
+                    valuecomponent=featureXML
+                else:
+                    valuecomponent=featureXML.find(xpath)
+                log.debug('valuecomponent %s'%valuecomponent)
+                if valuecomponent is not None:
+                    attribute=valuecomponent.get(attributeName)
+                    #TODO: important- how does WFS 2.0 represent xml attribute content?? if it does at all??
+                    #for now, have created element from attribute name e.g. <gml:id>
+                    newelem=etree.Element(attributeName)
+                    newelem.text=attribute                   
+                    valstr=etree.tostring(newelem)                    
+                    resultset.append(valstr)            
+        log.debug(resultset)
         return resultset      
     

cows/trunk/cows/service/imps/csmlbackend/wfs_csmlstoredqueries.py

@@ -15 +15 @@
 import csml.parser
 from xml.etree import ElementTree as etree
+from pylons import request, config
 
 class dummyfeaturefortesting(object):
@@ -33 +34 @@
     return featureset.getFeaturesByPropertyEqualTo('csml:parameter', phenomenon)    
 
-def query_extractPointFromPointSeries(featureset, timeinstance):
+def query_extractPointFromPointSeries(featureset, featureid, timeinstance):
     #TODO:  configure output directory
     #TODO: error handling
-    feature=featureset.getFeatureByGMLid('S9c7oW2p')._feature
-    newfeature, netcdfpath, storagedescriptor=feature.subsetToPoint(time=str(timeinstance), outputdir='/home/dom/csmlstore/csmlout')        
+    csmloutputdir=config['publish_dir']
+    feature=featureset.getFeatureByGMLid(featureid)._feature
+    newfeature, netcdfpath, storagedescriptor=feature.subsetToPoint(time=str(timeinstance), outputdir=csmloutputdir)        
     #wrap this in a wfs CSMLFeatureInstance object:
     csmlfi=wfs_csmllayer.CSMLFeatureInstance('subset feature title', 'subset feature abstract', newfeature)
@@ -43 +45 @@
     qualifiedFeatureType='{http://ndg.nerc.ac.uk/csml}' + storagedescriptor.__class__.__name__ 
     emptyelem=etree.Element(qualifiedFeatureType)
+    log.debug(request.environ)
+    #change the path of the storage descriptor to the download url - assumes routes maps to filestore
+    storagedescriptor.fileName.CONTENT='http://'+request.environ['HTTP_HOST']+'/filestore/' +storagedescriptor.fileName.CONTENT
     csmlelem=storagedescriptor.toXML(emptyelem)
     storagedescXML=etree.tostring(csmlelem)