Permettre à l'admin de choisir les sites visés par la recherche Google

Demande #1060

diff --git a/auf_savoirs_en_partage/savoirs/globals.py b/auf_savoirs_en_partage/savoirs/globals.py
index ea34d6c..e576da2 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/globals.py
+++ b/auf_savoirs_en_partage/savoirs/globals.py
@@ -13,7 +13,6 @@ configuration = {
     'nombre_par_page_actualite': 10,
     'resultats_par_page': 8, # pas changeable a cause de google
     'engin_recherche': 'sep',
-    'google_xml': SITE_ROOT_URL+MEDIA_URL+"sites/google/recherche.xml?%s",
     'calendrier_publique': 'https://sep-caldav.auf.org/caldav.php/sep/home',
 }
 

diff --git a/auf_savoirs_en_partage/savoirs/lib/recherche.py b/auf_savoirs_en_partage/savoirs/lib/recherche.py
index 1205fa5..99ed6fe 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/lib/recherche.py
+++ b/auf_savoirs_en_partage/savoirs/lib/recherche.py
@@ -15,10 +15,8 @@ def google_search (page, q):
               'rsz': 'large',
               'v': '1.0',
               'start': page * configuration['resultats_par_page'],
-              }
-
-    params['cref'] = configuration['google_xml'] % time.time()
-    url = "/ajax/services/search/web?" + urllib.urlencode (params)
+              'cref': SITE_ROOT_URL + MEDIA_URL + "sites/google.xml?%s" % time.time()}
+    url = "/ajax/services/search/web?" + urllib.urlencode(params)
 
     handle = httplib.HTTPConnection ('ajax.googleapis.com')
     handle.request ("GET", url)

diff --git a/auf_savoirs_en_partage/sitotheque/admin.py b/auf_savoirs_en_partage/sitotheque/admin.py
index 9ea4c11..08382df 100644 (file)
--- a/auf_savoirs_en_partage/sitotheque/admin.py
+++ b/auf_savoirs_en_partage/sitotheque/admin.py
@@ -5,6 +5,8 @@ from django.http import HttpResponseRedirect
 from models import Site
 
 class SiteAdmin(admin.ModelAdmin):
+    list_display = ['titre', 'recherche_google']
+    list_editable = ['recherche_google']
     actions = ('assigner_regions', 'assigner_disciplines')
     list_filter = ('discipline', 'regions')
 

diff --git a/auf_savoirs_en_partage/sitotheque/migrations/0002_auto__add_field_site_recherche_google.py b/auf_savoirs_en_partage/sitotheque/migrations/0002_auto__add_field_site_recherche_google.py
new file mode 100644 (file)
index 0000000..84b57ac
--- /dev/null
+++ b/auf_savoirs_en_partage/sitotheque/migrations/0002_auto__add_field_site_recherche_google.py
@@ -0,0 +1,140 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Site.recherche_google'
+        db.add_column('sitotheque_site', 'recherche_google', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Site.recherche_google'
+        db.delete_column('sitotheque_site', 'recherche_google')
+
+
+    models = {
+        'datamaster_modeles.bureau': {
+            'Meta': {'object_name': 'Bureau', 'db_table': "u'ref_bureau'"},
+            'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'implantation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Implantation']", 'db_column': "'implantation'"}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'nom_court': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'nom_long': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'region': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Region']", 'db_column': "'region'"})
+        },
+        'datamaster_modeles.implantation': {
+            'Meta': {'ordering': "('nom',)", 'object_name': 'Implantation', 'db_table': "u'ref_implantation'"},
+            'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adresse_physique_bureau': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_physique_code_postal': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'adresse_physique_code_postal_avant_ville': ('django.db.models.fields.NullBooleanField', [], {'null': 'True'}),
+            'adresse_physique_no': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'adresse_physique_pays': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'impl_adresse_physique'", 'db_column': "'adresse_physique_pays'", 'to': "orm['datamaster_modeles.Pays']"}),
+            'adresse_physique_precision': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_physique_precision_avant': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_physique_region': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_physique_rue': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_physique_ville': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'adresse_postale_boite_postale': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_postale_bureau': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_postale_code_postal': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'adresse_postale_code_postal_avant_ville': ('django.db.models.fields.NullBooleanField', [], {'null': 'True'}),
+            'adresse_postale_no': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'adresse_postale_pays': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'impl_adresse_postale'", 'db_column': "'adresse_postale_pays'", 'to': "orm['datamaster_modeles.Pays']"}),
+            'adresse_postale_precision': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_postale_precision_avant': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_postale_region': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_postale_rue': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'adresse_postale_ville': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'bureau_rattachement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Implantation']", 'db_column': "'bureau_rattachement'"}),
+            'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'code_meteo': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'commentaire': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'courriel': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'courriel_interne': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'date_extension': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'date_fermeture': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'date_inauguration': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'date_ouverture': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'fax': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'fax_interne': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'fuseau_horaire': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'hebergement_convention': ('django.db.models.fields.NullBooleanField', [], {'null': 'True'}),
+            'hebergement_convention_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'hebergement_etablissement': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'modif_date': ('django.db.models.fields.DateField', [], {}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'nom_court': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'nom_long': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'region': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Region']", 'db_column': "'region'"}),
+            'remarque': ('django.db.models.fields.TextField', [], {}),
+            'responsable_implantation': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'statut': ('django.db.models.fields.IntegerField', [], {}),
+            'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'telephone_interne': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'datamaster_modeles.pays': {
+            'Meta': {'ordering': "('nom',)", 'object_name': 'Pays', 'db_table': "u'ref_pays'"},
+            'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '2', 'primary_key': 'True'}),
+            'code_bureau': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Bureau']", 'to_field': "'code'", 'db_column': "'code_bureau'"}),
+            'code_iso3': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3', 'blank': 'True'}),
+            'developpement': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {}),
+            'monnaie': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'nord_sud': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'region': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Region']", 'db_column': "'region'"})
+        },
+        'datamaster_modeles.region': {
+            'Meta': {'object_name': 'Region', 'db_table': "u'ref_region'"},
+            'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'implantation_bureau': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'gere_region'", 'db_column': "'implantation_bureau'", 'to': "orm['datamaster_modeles.Implantation']"}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'datamaster_modeles.thematique': {
+            'Meta': {'object_name': 'Thematique', 'db_table': "u'ref_thematique'"},
+            'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'savoirs.discipline': {
+            'Meta': {'ordering': "['nom']", 'object_name': 'Discipline', 'db_table': "u'discipline'"},
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True', 'db_column': "'id_discipline'"}),
+            'nom': ('django.db.models.fields.CharField', [], {'max_length': '765', 'db_column': "'nom_discipline'"})
+        },
+        'sitotheque.site': {
+            'Meta': {'object_name': 'Site'},
+            'actif': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'auteur': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'date_maj': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'date_publication': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'discipline': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['savoirs.Discipline']", 'symmetrical': 'False', 'blank': 'True'}),
+            'editeur': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mots_cles': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'pays': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['datamaster_modeles.Pays']", 'null': 'True', 'db_column': "'pays'", 'blank': 'True'}),
+            'recherche_google': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'regions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sites'", 'blank': 'True', 'to': "orm['datamaster_modeles.Region']"}),
+            'thematique': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['datamaster_modeles.Thematique']", 'symmetrical': 'False', 'blank': 'True'}),
+            'titre': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['sitotheque']

diff --git a/auf_savoirs_en_partage/sitotheque/models.py b/auf_savoirs_en_partage/sitotheque/models.py
index 297408e..4f82414 100644 (file)
--- a/auf_savoirs_en_partage/sitotheque/models.py
+++ b/auf_savoirs_en_partage/sitotheque/models.py
@@ -67,6 +67,7 @@ class Site(models.Model):
     # meta
     actif = models.BooleanField(default=True)
     date_maj = models.DateField(auto_now=True)
+    recherche_google = models.BooleanField('Inclure dans la recherche Google', default=False)
 
     # Manager
     objects = SiteManager()

diff --git a/auf_savoirs_en_partage/sitotheque/views.py b/auf_savoirs_en_partage/sitotheque/views.py
index 87f8a3e..8671792 100644 (file)
--- a/auf_savoirs_en_partage/sitotheque/views.py
+++ b/auf_savoirs_en_partage/sitotheque/views.py
@@ -22,3 +22,9 @@ def retrieve(request, id):
     site = Site.objects.get(id=id)
     return render_to_response("sites/retrieve.html", dict(site=site),
                               context_instance = RequestContext(request))
+
+def config_google(request):
+    """Fichier de configuration pour la recherche Google"""
+    sites = Site.objects.filter(recherche_google=True)
+    return render_to_response("sites/google.xml", dict(sites=sites),
+                              context_instance = RequestContext(request))

diff --git a/auf_savoirs_en_partage/templates/sites/google.xml b/auf_savoirs_en_partage/templates/sites/google.xml
new file mode 100644 (file)
index 0000000..b96028d
--- /dev/null
+++ b/auf_savoirs_en_partage/templates/sites/google.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<GoogleCustomizations>
+  <CustomSearchEngine>
+    <Title>Les savoirs en partage</Title>
+    <Description>Recherche dans tous les site de l&apos;AUF.</Description>
+    <Context>
+      <BackgroundLabels>
+       <Label name="inclure" mode="FILTER" />
+      </BackgroundLabels>
+    </Context>
+  </CustomSearchEngine>
+  <Annotations>
+    {% for site in sites %}
+    <Annotation about="{{ site.url }}*" score="1">
+      <Label name="inclure" />
+    </Annotation>
+    {% endfor %}
+  </Annotations>
+</GoogleCustomizations>

diff --git a/auf_savoirs_en_partage/urls.py b/auf_savoirs_en_partage/urls.py
index eb0fcd3..4a27449 100644 (file)
--- a/auf_savoirs_en_partage/urls.py
+++ b/auf_savoirs_en_partage/urls.py
@@ -62,6 +62,7 @@ urlpatterns = sep_patterns + patterns(
     # sites
     (r'^sites/$', 'sitotheque.views.index', {}, 'sites'),
     (r'^sites/(?P<id>\d+)/$', 'sitotheque.views.retrieve'),
+    (r'^sites/google.xml$', 'sitotheque.views.config_google'),
 
     # sites AUF
     (r'^sites-auf/$', 'savoirs.views.sites_auf', {}, 'sites-auf'),