Changeset 8406 for mauRepo

Timestamp:

26/06/12 14:02:15 (9 years ago)

Author:

mnagni

Message:

# 22505: Use the CedaMoles? python package
removed the ceda_moles folders and verified the imports

Location:

mauRepo/HPFos/trunk

Files:

• hpfos (added)
• resources/requirements.txt (modified) (1 diff)
• src/HPFos/moles3epb.py (modified) (2 diffs)
• src/HPFos/osImpl/myimpl.py (modified) (5 diffs)
• src/HPFos/settings.py (modified) (1 diff)
• src/HPFos/view/view.py (modified) (1 diff)
• src/ascore (deleted)
• src/ea_model (deleted)
• src/sqlTables.py (deleted)
• src/tests/moles3epbtests.py (modified) (1 diff)
• src/tests/testconfig.py (modified) (1 diff)

mauRepo/HPFos/trunk/resources/requirements.txt

@@ -8 +8 @@
 # to your pip install 
 ceda-markup==0.0.1
+ceda-moles-model==0.1.0
 
 #This package should be available in the machine where CedaManager will be deployed

mauRepo/HPFos/trunk/src/HPFos/moles3epb.py

@@ -42 +42 @@
 from sqlalchemy.orm import mapper
 from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo
-from ea_model.moles3_4.utilities.mo_rolevalue import MO_RoleValue
 from sqlalchemy.orm.collections import InstrumentedList
 from ceda_guid import CedaGUID
@@ -242 +241 @@
         return self._session.query(CEDA_ObservationCollection, CEDA_Observation).filter(CEDA_ObservationCollection.id==obs_coll_id).all()
 
-    def observationAuthor(self, obs_id):
-        """
-            Lists the CEDA_Observation author.
-            @param obs_id: the CEDA_Observation id            
-            @return: True if the collection contains the given observation, False otherwise  
-        """
-        ret = self._session.query(MO_ResponsiblePartyInfo).join(MO_Observation). \
-            filter(MO_ResponsiblePartyInfo.role == MO_RoleValue.cl_author). \
-            filter(MO_Observation.id == obs_id)       
-        return ret
 
     def extractObservationByTitleKeywords(self, keywords):

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

@@ -46 +46 @@
 from ceda_markup.georss.georss import Where
 from ceda_markup.template.html import OSHTMLResponse
-from ceda_markup.opensearch.osquery import OSQuery
+from ceda_markup.opensearch.osquery import OSQuery, URL_INDEX_OFFSET_DEFAULT,\
+    URL_PAGE_OFFSET_DEFAULT
 from ceda_markup.opensearch.osParam import OSParam
 
@@ -239 +240 @@
         super(MyOSQuery, self).__init__(params)
 
-    def _packResult(self, results, **kwargs):
-        subresults = []
-
+
+    def _filterResults(self, results, **kwargs):
         step = calculateStep(**kwargs)
 
@@ -264 +264 @@
                 lastResult = len(results)
 
-        for result in results[firstResult - 1:lastResult]:
+        return results[firstResult - 1:lastResult]
+
+    def _packResult(self, results, **kwargs):
+
+        filtered = self._filterResults(results, **kwargs)
+
+        subresults = []
+        for result in filtered:
             result_guid = kwargs['moles3EPB'].retrieveGUIDFromInstance(result)
             item = Subresult(result_guid.id, "title", datetime.now().isoformat())
@@ -270 +277 @@
         
         return Result(len(results), subresult = subresults)
-        
+
         
     def doSearch(self, **kwargs):
@@ -290 +297 @@
         results = kwargs['moles3EPB'].getObservationCollections(bbox = ibbox)
 
-                                  
-                
+
         
         return self._packResult(results, **kwargs)

mauRepo/HPFos/trunk/src/HPFos/settings.py

@@ -169 +169 @@
 #MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION'
 #MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3'
-MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3_test1'
-from sqlTables import doTables as doMoles
+MOLES3_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3_dev1'
+from ea_model.sqlTables import doTables as doMoles
 MOLES3_DB_SCRIPT = doMoles

mauRepo/HPFos/trunk/src/HPFos/view/view.py

@@ -78 +78 @@
         params[RESULT] = result_guid                
     
-    response = os_engine.doSearch(hostURL, iformat, params_values = params, moles3EPB = request.moles3EPB)
+    response = os_engine.doSearch(hostURL, iformat, params_values = params, moles3EPB = request.moles3EPB, \
+                                  startIndex = 1, startPage = 2, count = 0)
     context = {}
     context['response'] = mark_safe(response)

mauRepo/HPFos/trunk/src/tests/moles3epbtests.py

@@ -37 +37 @@
 from tests.testconfig import getMoles3EPB, closeEPB
 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection
-from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
 
 class Moles3EPBTest(TestCase):

mauRepo/HPFos/trunk/src/tests/testconfig.py

@@ -37 +37 @@
 POSTGIS_DB_CONNECTION = 'postgresql://badc:rotyn217m@neptune.badc.rl.ac.uk:5432/Moles3'
 
-from sqlTables import doTables as doMoles, attachEvents
+from ea_model.sqlTables import doTables as doMoles, attachEvents
 MOLES3_DB_SCRIPT = doMoles
 EVENTS_DB = attachEvents