Changeset 8550

Timestamp:

04/09/12 08:52:26 (8 years ago)

Author:

mnagni

Message:

Incomplete - # 22551: List resources / display single file
 http://team.ceda.ac.uk/trac/ceda/ticket/22551
Updates ceda-markup to 0.0.11
Adds part of the setup.py structure

Location:

mauRepo/HPFos/trunk

Files:

• . (modified) (1 prop)
• .settings (added)
• LICENCE (added)
• MANIFEST.in (added)
• README (added)
• hpfos/HPFos/osImpl/myimpl.py (modified) (2 diffs)
• resources/requirements.txt (modified) (1 diff)
• setup.py (added)

mauRepo/HPFos/trunk/hpfos/HPFos/osImpl/myimpl.py

@@ -50 +50 @@
 from ceda_markup.opensearch.template.html import OSHTMLResponse
 from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant import TM_Instant
+from ceda_markup.georss import create_where_from_postgis
 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection \
     import CEDA_ObservationCollection
@@ -323 +324 @@
             
             if hasattr(subresult, 'geometry') and subresult.geometry is not None:
-                self._append_where(subresult.geometry, entry, atomroot)
+                where = create_where_from_postgis(subresult.geometry, atomroot)
+                entry.append(where)
             
             self.generateEntryLinks(entry, atomroot, path, subresult.id)

mauRepo/HPFos/trunk/resources/requirements.txt

@@ -7 +7 @@
 # --extra-index-url http://ciprod1.cems.rl.ac.uk/pip
 # to your pip install 
-ceda-markup==0.0.10
+ceda-markup==0.0.11
 ceda-moles-model==0.1.5