Changeset 8502

Timestamp:

09/08/12 14:55:29 (8 years ago)

Author:

mnagni

Message:

Incomplete - # 22534: Add versiojn number to the gui page
 http://team.ceda.ac.uk/trac/ceda/ticket/22534
SearchByKeyword?, returns a dictionary of objects where the key is the GUID of the object in the value

File:

• mauRepo/MolesManager/trunk/cedaMoles/MolesManager/moles3epb.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/moles3epb.py

@@ -258 +258 @@
             Loooks for CEDA_Observation containing a specific title (observation.identifier.code)
             @param keywords: a space separated terms string
-            @return: a tuple containing a CEDA_Observation satisfying the queryllection.idenfitier element having the title  
+            @returns: dictionary where the keys are the GUID of the CEDA_Observation in the value  
         """                
         # search_vector is a ts_vector column. To search for terms, you use the 
@@ -270 +270 @@
         # should always be put into queries this way to prevent SQL injection.
         q = q.params(terms=keywords)
-        return q.all()
+        
+        ret = {}
+        for item in q.all():
+            guid = self.retrieveGUIDFromInstance(item)
+            if guid is not None:
+                ret[guid.id] = item            
+        return ret
+        return