ajout page retrieve ressource, ajout de meta, liens

diff --git a/auf_savoirs_en_partage/media/css/global.css b/auf_savoirs_en_partage/media/css/global.css
index 96e2f39..b74a9ef 100644 (file)
--- a/auf_savoirs_en_partage/media/css/global.css
+++ b/auf_savoirs_en_partage/media/css/global.css
@@ -277,3 +277,12 @@ font-weight:bold;
 font-size:12px;
 color:red;
 }
+
+
+.ressource-retrieve * {margin-top: 1em;}
+
+.le-titre{line-height: 24px;}
+
+.fiche, .original, .provenance {font-size: 80%; margin: 2px 0px;}
+.fiche {margin-top: 12px;}
+.fiche a, .original a, .provenance a{text-decoration: none;}

diff --git a/auf_savoirs_en_partage/savoirs/lib/recherche.py b/auf_savoirs_en_partage/savoirs/lib/recherche.py
index 90bc67c..9dde30c 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/lib/recherche.py
+++ b/auf_savoirs_en_partage/savoirs/lib/recherche.py
@@ -2,11 +2,11 @@
 import urllib, httplib, time, simplejson, pprint, math, re
 from django.core.urlresolvers import reverse
 from django.conf import settings
+from auf_savoirs_en_partage.backend_config import RESOURCES
 from sep import SEP
 from utils import smart_str
 from savoirs.globals import configuration
 
-
 def google_search (page, q, data):
     params = {'q': q,
               'rsz': 'large',
@@ -107,6 +107,8 @@ def sep_search (page, q, data):
         if len (uri) == 0:
             uri = r.get ("source")
         
+        serveur = RESOURCES[r.get('server')]['url']
+
         # Récupère la source si ce n'est pas une URL
         source = r.get("source", None)
         if source is not None and source.startswith('http'):
@@ -125,6 +127,7 @@ def sep_search (page, q, data):
 
         data['results'].append ({
                 'uri': uri,
+                'getServeurURL': serveur,
                 'source' : source,
                 'id': r.get("id"), \
                 'title': hl(regexp, title), 

diff --git a/auf_savoirs_en_partage/savoirs/models.py b/auf_savoirs_en_partage/savoirs/models.py
index b45b76b..093fd08 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/models.py
+++ b/auf_savoirs_en_partage/savoirs/models.py
@@ -338,6 +338,10 @@ class Record(models.Model):
     # Manager
     objects = RecordManager()
 
+    def getServeurURL(self,):
+        """Retourne l'URL du serveur de provenance"""
+        return RESOURCES[self.server]['url']
+
     def est_complet(self,):
         """teste si le record à toutes les données obligatoires"""
         return self.disciplines.count() > 0 and \

diff --git a/auf_savoirs_en_partage/savoirs/views.py b/auf_savoirs_en_partage/savoirs/views.py
index 1b8fc8c..7116607 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/views.py
+++ b/auf_savoirs_en_partage/savoirs/views.py
@@ -104,6 +104,7 @@ def avancee (request):
             Context ({'type': type,
                       'page': page,
                       'data': r,
+                      'search_regexp': None, # pour pouvoir utiliser la même template de résultat
                       'form': f,
                       'q': q}), 
             context_instance = RequestContext(request))

diff --git a/auf_savoirs_en_partage/templates/savoirs/avancee.html b/auf_savoirs_en_partage/templates/savoirs/avancee.html
index d152399..8c2921d 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/avancee.html
+++ b/auf_savoirs_en_partage/templates/savoirs/avancee.html
@@ -63,8 +63,10 @@
   <h4>Résultats de recherche:</h4>
 
   <div class="zone-texte">
-    {% for r in data.results %}
-      {% include "savoirs/resultat.html" %}
+      {% for r in data.results %}
+      {% with r as ressource %}
+        {% include "savoirs/ressource_resultat.html" %}
+      {% endwith %}
     {% empty %}
     <div class="resultatRecherche">
       <h2>Aucun résultat trouvé</h2>

diff --git a/auf_savoirs_en_partage/templates/savoirs/ressource_resultat.html b/auf_savoirs_en_partage/templates/savoirs/ressource_resultat.html
index f54800f..8992f9a 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/ressource_resultat.html
+++ b/auf_savoirs_en_partage/templates/savoirs/ressource_resultat.html
@@ -1,11 +1,20 @@
 {% load search %}
 
 <div class="resultatRecherche">
-    <a class="le-titre" href="{{ ressource.uri }}">{{ ressource.title|highlight:search_regexp }}</a>
+    <a class="le-titre" href="{% url savoirs.views.ressource_retrieve ressource.id %}">{{ ressource.title|highlight:search_regexp }}</a>
     {% if ressource.creator %}
     <div><span class="lbl">Auteur:</span> {{ ressource.creator|highlight:search_regexp }}</div>
     {% endif %}
     {% if ressource.description %}
     <div class="resultatResume"><span class="lbl">Description:</span> {{ ressource.description|excerpt:search_regexp|highlight:search_regexp }}</div>
     {% endif %}
+    <div class="fiche"><span>Fiche: </span><a href="{% url savoirs.views.ressource_retrieve ressource.id %}">{% url savoirs.views.ressource_retrieve ressource.id %}</a></div>
+    <div class="original"><span>Contenu original: </span><a target="_blank" href="{{ ressource.uri }}">{{ ressource.uri }}</a></div>
+    <div class="provenance"><span>Provenance: </span><a target="_blank" href="{{ ressource.getServeurURL }}">{{ ressource.getServeurURL }}</a></div>
 </div>
+
+    {% comment %}
+    {% if user.is_authenticated %}
+    <a href="{{ r.admin_url}}" target="_blank">Modifier</a>
+    {% endif %}
+    {% endcomment %}

diff --git a/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html b/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html
index f7a168a..ca0d606 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html
+++ b/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html
@@ -3,9 +3,46 @@
 {% block contenu %}
 <h4>Ressource</h4>
 
-<div class="zone-texte">
-  {% with ressource as r %}
-    {% include "savoirs/resultat.html" %} 
-  {% endwith %}
+<div class="zone-texte ressource-retrieve">
+    
+    <a class="le-titre" href="{% url savoirs.views.ressource_retrieve ressource.id %}">{{ ressource.title }}</a>
+
+    {% if ressource.subject %}
+    <div><span class="lbl">Sujet:</span> {{ ressource.subject }}</div>
+    {% endif %}
+
+    {% if ressource.creator %}
+    <div><span class="lbl">Auteur:</span> {{ ressource.creator }}</div>
+    {% endif %}
+    {% if ressource.description %}
+    <div class="resultatResume"><span class="lbl">Description:</span> {{ ressource.description }}</div>
+    {% endif %}
+
+    {% if ressource.source %}
+    <div><span class="lbl">Source:</span> {{ ressource.source }}</div>
+    {% endif %}
+
+    {% if ressource.publisher %}
+    <div><span class="lbl">Editeur:</span> {{ ressource.publisher }}</div>
+    {% endif %}
+
+    {% if ressource.format %}
+    <div><span class="lbl">Format:</span> {{ ressource.format }}</div>
+    {% endif %}
+
+    {% if ressource.type %}
+    <div><span class="lbl">Type:</span> {{ ressource.type }}</div>
+    {% endif %}
+
+
+
+
+
+    <div class="fiche"><span>Fiche: </span><a href="{% url savoirs.views.ressource_retrieve ressource.id %}">{% url savoirs.views.ressource_retrieve ressource.id %}</a></div>
+    <div class="original"><span>Contenu original: </span><a target="_blank" href="{{ ressource.uri }}">{{ ressource.uri }}</a></div>
+    <div class="provenance"><span>Provenance: </span><a target="_blank" href="{{ ressource.getServeurURL }}">{{ ressource.getServeurURL }}</a></div>
+
+
+
 </div>
 {% endblock %}

diff --git a/auf_savoirs_en_partage/templates/savoirs/resultat.html b/auf_savoirs_en_partage/templates/savoirs/resultat.html
deleted file mode 100644 (file)
index 31eb49f..0000000
--- a/auf_savoirs_en_partage/templates/savoirs/resultat.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="resultatRecherche">
-  <a class="le-titre" href="{{ r.uri }}">{{ r.title|safe }}</a>
-  {% if r.creator %}
-  <div><span class="lbl">Auteur:</span> {{ r.creator|safe }}</div>
-  {% endif %}
-  {% if r.content %}
-  <div class="resultatResume"><span class="lbl">Description:</span> {{ r.content|safe }}</div>
-  {% endif %}
-  
-  {% comment %}
-      {% if r.contributors %}
-      <div><span class="lbl">Contributeurs:</span> {{ r.contributors|safe }}</div>
-      {% endif %}
-      {% if r.subject %}
-      <div><span class="lbl">Sujets:</span> {{ r.subject|safe }}</div>
-      {% endif %}
-      {% if r.source %}
-      <div><span class="lbl">Source:</span> {{ r.source|safe }}</div>
-      {% endif %}
-      {% if r.modified %}
-      <div><span class="lbl">Date de modification:</span> {{ r.modified }}</div>
-      {% endif %}
-      {% if r.isbn %}
-      <div><span class="lbl">ISBN:</span> {{ r.isbn|safe }}</div>
-      {% endif %}
-      {% if user.is_authenticated %}
-      <a href="{{ r.admin_url}}" target="_blank">Modifier</a>
-      {% endif %}
-  {% endcomment %}
-</div>