Corrections mineures

diff --git a/auf_savoirs_en_partage_django/savoirs/models.py b/auf_savoirs_en_partage_django/savoirs/models.py
index 9b45d5d..2bc1349 100644 (file)
--- a/auf_savoirs_en_partage_django/savoirs/models.py
+++ b/auf_savoirs_en_partage_django/savoirs/models.py
@@ -20,7 +20,7 @@ class Actualite(models.Model):
     logo = models.CharField(max_length=765, db_column='logo_actualite')
     date = models.DateField(db_column='date_actualite')
     visible = models.CharField(max_length=3, db_column='visible_actualite')
-    ancienid = models.IntegerField(db_column='ancienId_actualite') # Field name made lowercase.
+    ancienid = models.IntegerField(db_column='ancienId_actualite')
 
     def __unicode__ (self):
         return "Actualite %d: %s" % (self.id, self.titre)

diff --git a/auf_savoirs_en_partage_django/savoirs/recherche.py b/auf_savoirs_en_partage_django/savoirs/recherche.py
index e222ea8..6a0f491 100644 (file)
--- a/auf_savoirs_en_partage_django/savoirs/recherche.py
+++ b/auf_savoirs_en_partage_django/savoirs/recherche.py
@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 import urllib, httplib, time, simplejson, pprint, math, re
+from django.conf import settings
 from auf_savoirs_en_partage_backend.sep.io import SEP
 from savoirs import configuration
 
@@ -8,8 +9,12 @@ def google_search (page, q, data):
               'rsz': 'large',
               'v': '1.0',
               'start': page * configuration['resultats_par_page'],
-              #'cref': "http://savoirsenpartage.auf.org/recherche.xml?%s" % int(time.time())
               }
+    if not settings.DEBUG:
+        #TODO: corriger ts
+        params['cref'] = "http://savoirsenpartage.auf.org/recherche.xml?%s" \
+                % int(time.time())
+
     url = "/ajax/services/search/web?" + \
             urllib.urlencode (params)
     handle = httplib.HTTPConnection ('ajax.googleapis.com')
@@ -75,16 +80,15 @@ def sep_search (page, q, data):
         if len (uri) == 0:
             uri = r.get ("uri")
         title = r.get ("title", "")
-        tmp = r.get ("description", "")
-        content = sep_build_content (regexp, tmp)
+        content = sep_build_content (regexp, r.get ("description", ""))
 
         data['results'].append ({'uri': uri, 'title': title, 'content': content})
 
-    #data['results'] = s.get (matches[f:t])
 
-def cherche (engin, page, q):
+def cherche (page, q):
     rc = {'results': [], 'last_page': 0, 'more_link': ''}
-    lastp = 0
+
+    engin = configuration['engin_recherche']
 
     if engin == 'google':
         google_search (page, q, rc)

diff --git a/auf_savoirs_en_partage_django/savoirs/views.py b/auf_savoirs_en_partage_django/savoirs/views.py
index 7bd5f25..1ab998f 100644 (file)
--- a/auf_savoirs_en_partage_django/savoirs/views.py
+++ b/auf_savoirs_en_partage_django/savoirs/views.py
@@ -20,7 +20,7 @@ def recherche (request):
     q = request.GET.get("q", "")
     page = int(request.GET.get("page", 0))
 
-    r = cherche (configuration['engin_recherche'], page, q)
+    r = cherche (page, q)
 
     return render_to_response ("recherche.html", \
             Context ({'q': q,