Changeset 8339

Timestamp:

13/06/12 16:03:22 (8 years ago)

Author:

mnagni

Message:

Fixed the /search

Location:

mauRepo/MolesManager/trunk/src/MolesManager

Files:

• moles3epb.py (modified) (1 diff)
• views/cedaSearch.py (modified) (3 diffs)
• views/cedacat.py (modified) (2 diffs)

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

@@ -169 +169 @@
         # should always be put into queries this way to prevent SQL injection.
         q = q.params(terms=keywords)
-        return q
+        return q.all()
 
 

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

@@ -4 +4 @@
 @author: mnagni
 '''
-from django.shortcuts import render_to_response, redirect
 from django.core.context_processors import csrf
-from MolesManager.views import cedaObservationView
-from MolesManager.ceda_guid import CedaGUID
-from MolesManager.moles3epb import Moles3EPB
+from django.shortcuts import render_to_response
 
 """
@@ -27 +24 @@
     if not keywords.endswith("'"):
         keywords = keywords + "'"
-    obsevations = Moles3EPB.extractObservationByTitleKeywords(keywords) 
+    obsevations = request.moles3EPB.extractObservationByTitleKeywords(keywords) 
     titles = []
     ids = []
@@ -36 +33 @@
             [baseCov,
             str(o.id)])
-        auth_query = Moles3EPB.observationAuthor(o.id)
+        auth_query = request.moles3EPB.observationAuthor(o.id)
         ath = auth_query.all()
         ath0 = ath[0]

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

@@ -9 +9 @@
 from MolesManager.views import cedaObservationView
 from MolesManager.ceda_guid import CedaGUID
-from MolesManager.moles3epb import Moles3EPB
 
 def cedacat(request, guid):
@@ -17 +16 @@
 
     if ceda_guid and ceda_guid.ceda_observationcollection:
-        #return rediect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection)
+        #return redirect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection)
         pass