Changeset 8339 for mauRepo/MolesManager


Ignore:
Timestamp:
13/06/12 16:03:22 (7 years ago)
Author:
mnagni
Message:

Fixed the /search

Location:
mauRepo/MolesManager/trunk/src/MolesManager
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

    r8337 r8339  
    169169        # should always be put into queries this way to prevent SQL injection. 
    170170        q = q.params(terms=keywords) 
    171         return q 
     171        return q.all() 
    172172 
    173173 
  • mauRepo/MolesManager/trunk/src/MolesManager/views/cedaSearch.py

    r8323 r8339  
    44@author: mnagni 
    55''' 
    6 from django.shortcuts import render_to_response, redirect 
    76from 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 
     7from django.shortcuts import render_to_response 
    118 
    129""" 
     
    2724    if not keywords.endswith("'"): 
    2825        keywords = keywords + "'" 
    29     obsevations = Moles3EPB.extractObservationByTitleKeywords(keywords)  
     26    obsevations = request.moles3EPB.extractObservationByTitleKeywords(keywords)  
    3027    titles = [] 
    3128    ids = [] 
     
    3633            [baseCov, 
    3734            str(o.id)]) 
    38         auth_query = Moles3EPB.observationAuthor(o.id) 
     35        auth_query = request.moles3EPB.observationAuthor(o.id) 
    3936        ath = auth_query.all() 
    4037        ath0 = ath[0] 
  • mauRepo/MolesManager/trunk/src/MolesManager/views/cedacat.py

    r8338 r8339  
    99from MolesManager.views import cedaObservationView 
    1010from MolesManager.ceda_guid import CedaGUID 
    11 from MolesManager.moles3epb import Moles3EPB 
    1211 
    1312def cedacat(request, guid): 
     
    1716 
    1817    if ceda_guid and ceda_guid.ceda_observationcollection: 
    19         #return rediect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection) 
     18        #return redirect(cedaObservationCollectionView.FIXME_VIEW, ceda_guid.ceda_observationcollection) 
    2019        pass 
    2120 
Note: See TracChangeset for help on using the changeset viewer.