Changeset 8421 for mauRepo

Timestamp:

29/06/12 17:27:40 (9 years ago)

Author:

mnagni

Message:

Complete - # 22488: CEDA Observation Collection - Geographical Extent
 http://team.ceda.ac.uk/trac/ceda/ticket/22488
Incomplete - # 22513: Missing ValidTime? tag in the CedaSearch?
 http://team.ceda.ac.uk/trac/ceda/ticket/22513

Now uses the ceda-markup v 0.0.3

Location:

mauRepo/HPFos/trunk

Files:

• resources/requirements.txt (modified) (1 diff)
• src/HPFos/osImpl/myimpl.py (modified) (4 diffs)

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.1
+ceda-markup==0.0.3
 ceda-moles-model==0.1.0
 

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

@@ -35 +35 @@
 from datetime import datetime
 from libs.postgisutil import create_st_setSRID
-from ceda_markup.atom.atom import Atom
+#from ceda_markup.atom.atom import Atom
 from ceda_markup.opensearch.os_response import OpenSearchResponse
 from ceda_markup.atom.link import Link
 from ceda_markup.opensearch.os_engine import get_mimetype
 from ceda_markup.template.atom import OSAtomResponse
-from ceda_markup.atom.info import Title, Info, Content
-from ceda_markup.atom.entry import Entry
-from ceda_markup.dc.dc import Date
-from ceda_markup.gml.gml import PosList, LinearRing, Exterior, Polygon
-from ceda_markup.georss.georss import Where
+#from ceda_markup.atom.info import Title, Info, Content
+#from ceda_markup.atom.entry import Entry
+#from ceda_markup.dc.dc import Date
+#from ceda_markup.gml.gml import PosList, LinearRing, Exterior, Polygon
+#from ceda_markup.georss.georss import Where
 from ceda_markup.template.html import OSHTMLResponse
 from ceda_markup.opensearch.osquery import OSQuery, URL_INDEX_OFFSET_DEFAULT,\
     URL_PAGE_OFFSET_DEFAULT
 from ceda_markup.opensearch.osParam import OSParam
+from ceda_markup.atom.atom import createAtom, createID, createUpdated,\
+    createPublished, createLink, ATOM_LINK_REL_SEARCH
+from ceda_markup.atom.info import createTitle, HTML_TYPE, createContent
+from ceda_markup.atom.entry import createEntry
+from ceda_markup.dc.dc import createDate
+from ceda_markup.gml.gml import createPosList, createLinearRing, createExterior,\
+    createPolygon
+from ceda_markup.georss.georss import createWhere
 
 COLLECTION = 'collection'
@@ -88 +96 @@
         
         #Generates the ATOM document
-        atomdoc = Atom.createDocument(ospath + "atom", \
-                                      result.title, \
-                                      result.updated)
+        atomID = createID(ospath + "atom")
+        atomTitle = createTitle(result.title)
+        atomUpdate = createUpdated(result.updated)
+        atomdoc = createAtom()
+        atomdoc.append(atomID)
+        atomdoc.append(atomTitle)
+        atomdoc.append(atomUpdate)
         
         #configuration level
@@ -136 +148 @@
     def appendAtomLink(self, atomroot, path, linkid = None, startIndex = 0, rel = Link.REL_SELF):
         href = self.generateLinkHref(path, linkid, startIndex, rel)
-        type = get_mimetype(self.extension)
-        if rel == Link.REL_SEARCH:
-            type = get_mimetype('opensearchdescription')            
-        link = Link(href, rel, type)                    
-        atomroot.append(link.buildElement())
+        itype = get_mimetype(self.extension)
+        if rel == ATOM_LINK_REL_SEARCH:
+            itype = get_mimetype('opensearchdescription')            
+        link = createLink(href, rel = rel, itype = itype)                    
+        atomroot.append(link)
 
     def generateLinkHref(self, path, linkid, startIndex = None, rel = Link.REL_SELF):
@@ -177 +189 @@
         for subresult in subresults: 
             #Here could loop over results
-            ititle = Title(Info.HTML_TYPE, subresult.title)
-            icontent = Content(Info.HTML_TYPE, subresult.description)
-            entry = Entry(path + subresult.id + '/' + self.extension, \
-                          ititle.buildElement(), \
-                          subresult.updated, \
-                          published = '2011-01-21T11:05:29.511Z', \
-                           link = [], \
-                           content = icontent.buildElement())
-            xmlentry = entry.buildElement()
+            #ititle = Title(Info.HTML_TYPE, subresult.title)
+            #icontent = Content(Info.HTML_TYPE, subresult.description)
+            atomID = createID(path + subresult.id + '/' + self.extension, root = atomroot)
+            ititle = createTitle(root = atomroot, body = subresult.title, itype = HTML_TYPE)
+            atomContent = createContent(root = atomroot, body = subresult.description, itype = HTML_TYPE)
+            atomUpdated = createUpdated(subresult.updated, root = atomroot)
+            atomPublished = createPublished('TO_BE_DONE_2011-01-21T11:05:29.511Z', root = atomroot)            
+            entry = createEntry(atomID, ititle, atomUpdated,
+                                published=atomPublished,
+                                content=atomContent)
+            #xmlentry = entry.buildElement()
             
-            idate = Date(atomroot, '2002-10-18T08:07:37.387Z/2012-03-29T07:12:20.735Z')        
-            xmlentry.append(idate.buildElement())
+            idate = createDate(root = atomroot, 
+                               body = 'TO_BE_DONE_2002-10-18T08:07:37.387Z/2012-03-29T07:12:20.735Z')        
+            entry.append(idate)
             
-            posList = PosList(atomroot, body = '-90 -180 90 -180 90 180 -90 180 -90 -180', srsDimension = '2')
-            linearRing = LinearRing(atomroot, posList)
-            exterior = Exterior(atomroot, linearRing)
-            polygon = Polygon(atomroot, exterior)
-            where = Where(atomroot, polygon)
-            xmlentry.append(where.buildElement())
-            self.generateEntryLinks(xmlentry, path, subresult.id)
+            posList = createPosList(root = atomroot, body = '-90 -180 90 -180 90 180 -90 180 -90 -180', srsDimension = '2')
+            linearRing = createLinearRing(root = atomroot, body = posList)
+            exterior = createExterior(root = atomroot, body = linearRing)
+            polygon = createPolygon(root = atomroot, body = exterior)
+            where = createWhere(root = atomroot, body = polygon)
+            entry.append(where)
+            self.generateEntryLinks(entry, path, subresult.id)
             
-            entries.append(xmlentry)
+            entries.append(entry)
 
         for entry in entries: