Changeset 8430 for mauRepo

Timestamp:

03/07/12 17:04:37 (9 years ago)

Author:

mnagni

Message:

Fixed many problems with the search function. Obviously need to be improved more.

Location:

mauRepo/MolesManager/trunk

Files:

• resources/requirements.txt (modified) (1 diff)
• src/MolesManager/moles3epb.py (modified) (5 diffs)
• src/MolesManager/static/templates/base.html (modified) (3 diffs)
• src/MolesManager/views/cedaSearch.py (modified) (1 diff)

mauRepo/MolesManager/trunk/resources/requirements.txt

@@ -11 +11 @@
 # --extra-index-url http://ciprod1.cems.rl.ac.uk/pip
 # to your pip install 
-ceda-moles-model==0.1.0
+ceda-moles-model==0.1.1

mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

@@ -46 +46 @@
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
 from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project
+from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo
+from ea_model.moles3_4.utilities.ceda_rolevalue import CEDA_RoleValue
+from MolesManager.codelist import MM_RoleValue, getCLValue
 
 class Moles3EPBFactory(EPB):
@@ -152 +155 @@
         return coll                                      
 
-    def getGeograpicExtentGeometry(self, ge):
-        '''
-            Creates the appropriate postgis geometry from a EX_GeographicExtent
-            @param ge: an EX_GeographicExtent instance
-            @return: a postgix text geometry
-        '''
-        if isinstance(ge, EX_GeographicBoundingBox):
-            return create_st_setSRID(ge.westBoundLongitude, ge.southBoundLatitude, \
-                           ge.eastBoundLongitude, ge.northBoundLatitude)
-        return None
-
     def getUnifyObservationCollectionGEAsBBox(self, collection):
         """
@@ -171 +163 @@
         for member in collection.member:
             for ge in member.geographicExtent:
-                bboxes.append(self.getGeograpicExtentGeometry(ge))
+                bboxes.append(getGeograpicExtentGeometry(ge))
         
         return unifyGeometriesAsBBox(bboxes, self)  
@@ -199 +191 @@
         return obs in coll.member
 
-    def observationAuthor(self, obs_id):
+    def observationAuthor(self, observation):
         """
             Lists the CEDA_Observation author.
-            @param obs_id: the CEDA_Observation id            
+            @param observation: the CEDA_Observation inside which look for the author            
             @return: True if the collection contains the given observation, False otherwise  
         """
         
         # TO FIX!!!
-        
-        '''
-        ret = self._session.query(MO_ResponsiblePartyInfo).join(MO_Observation). \
-            filter(MO_ResponsiblePartyInfo.role == CEDA_RoleValue.cl_author). \
-            filter(MO_Observation.id == obs_id)       
-        return ret
-        '''
+        for partyInfo in observation.relatedParty:
+            if partyInfo.role == getCLValue(MM_RoleValue.cl_author):
+                return partyInfo.party       
+
         
 
@@ -327 +316 @@
     def executeNative(self, sqlNative):
         return EPB.executeNative(sqlNative, self._session)  
+
+
+def getGeograpicExtentGeometry(ge):
+    '''
+        Creates the appropriate postgis geometry from a EX_GeographicExtent
+        @param ge: an EX_GeographicExtent instance
+        @return: a postgix text geometry
+    '''
+    if isinstance(ge, EX_GeographicBoundingBox):
+        return create_st_setSRID(ge.westBoundLongitude, ge.southBoundLatitude, \
+                       ge.eastBoundLongitude, ge.northBoundLatitude)
+    return None

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

@@ -86 +86 @@
                                         encType="multipart/form-data"
                                         action="{% url MolesManager.views.cedaSearch.coSearch %}" method="POST">
-        
-                                        <script type="dojo/method" data-dojo-event="onSubmit">
-                                                if(this.validate()){
-                                                        return confirm('Form is valid, press OK to submit');
-                                                }else{
-                                                        alert('Form contains invalid data.  Please correct first');
-                                                        return false;
-                                                }
-                                                return true;
-                                        </script>
                                 
                                         {% csrf_token %}
         
-                                        <!--    <div class="fieldWrapper claro">
+                                        <div class="fieldWrapper claro">
                                                         <label for="id_obj_id">Search:</label>
                                                         <input type="text" name="searchTerm" value= ""
@@ -107 +97 @@
                                                 
                                                 </div> <!-- End of div fieldWrapper -->
+                                        <!-- 
                                         <form method=POST name="searchAll" action="http://badc.nerc.ac.uk/cgi-bin/search/select_search">
                                         <input type="hidden" name=badc_only value="n">
@@ -120 +111 @@
                                         </table>
                                         </center>
+                                         -->
                                 </div> <!-- End of div myForm -->
                                 

mauRepo/MolesManager/trunk/src/MolesManager/views/cedaSearch.py

@@ -30 +30 @@
     baseCov = "http://" + request.get_host() + "/cov/"
     for o in obsevations:
-        a = "".join(
-            [baseCov,
-            str(o.id)])
-        auth_query = request.moles3EPB.observationAuthor(o.id)
-        ath = auth_query.all()
-        ath0 = ath[0]
-        list_list.append((a, o.description, ath0.role)) 
+        a = "".join([baseCov, str(o.id)])
+        responsibleAuthors = request.moles3EPB.observationAuthor(o)
+        list_list.append((a, o.description, _appendAuthors(responsibleAuthors))) 
     return list_list
+
+def _appendAuthors(party):
+    res = None
+    for item in party:
+         res = ("%s%s,") % (res, item.name)
+    if len(res) > 1:
+        return res[:len(res)-1]
+    return res