Changeset 8339
- Timestamp:
- 13/06/12 16:03:22 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk/src/MolesManager
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py
r8337 r8339 169 169 # should always be put into queries this way to prevent SQL injection. 170 170 q = q.params(terms=keywords) 171 return q 171 return q.all() 172 172 173 173 -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedaSearch.py
r8323 r8339 4 4 @author: mnagni 5 5 ''' 6 from django.shortcuts import render_to_response, redirect7 6 from django.core.context_processors import csrf 8 from MolesManager.views import cedaObservationView 9 from MolesManager.ceda_guid import CedaGUID 10 from MolesManager.moles3epb import Moles3EPB 7 from django.shortcuts import render_to_response 11 8 12 9 """ … … 27 24 if not keywords.endswith("'"): 28 25 keywords = keywords + "'" 29 obsevations = Moles3EPB.extractObservationByTitleKeywords(keywords)26 obsevations = request.moles3EPB.extractObservationByTitleKeywords(keywords) 30 27 titles = [] 31 28 ids = [] … … 36 33 [baseCov, 37 34 str(o.id)]) 38 auth_query = Moles3EPB.observationAuthor(o.id)35 auth_query = request.moles3EPB.observationAuthor(o.id) 39 36 ath = auth_query.all() 40 37 ath0 = ath[0] -
mauRepo/MolesManager/trunk/src/MolesManager/views/cedacat.py
r8338 r8339 9 9 from MolesManager.views import cedaObservationView 10 10 from MolesManager.ceda_guid import CedaGUID 11 from MolesManager.moles3epb import Moles3EPB12 11 13 12 def cedacat(request, guid): … … 17 16 18 17 if ceda_guid and ceda_guid.ceda_observationcollection: 19 #return redi ect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection)18 #return redirect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection) 20 19 pass 21 20
Note: See TracChangeset
for help on using the changeset viewer.