dublin core: add rights and description in item expression, oai-pmh: include protocol...

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 2561198545c8660eebcb9602a67f983704c20236..056789ad19805ffe909eb99d901b2442eb4d2314 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -269,9 +269,11 @@ class MediaItem(Model, MediaCore):
             dc.Element('relation', 'collection', self.collection.id, 'isPartOf'),
             dc.Element('title', 'title', self.title),
             dc.Element('creator', value=creator),
+            dc.Element('description', value=self.comm_fonctusage),
             dc.Element('publisher', value=self.collection.publisher),
             dc.Element('coverage', value=self.etat),
             dc.Element('format', value=duration, refinement="extent"),
+            dc.Element('rights', value=self.collection.rights)
         )
         return resource
 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index bdd32f624f5c1aa839768424304c8772e7ced425..7a7af5a382d14b7d11866f56e6ef0bcc03355935 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -326,11 +326,11 @@ class WebView(Component):
             extra_context={'country': country, 'continent': continent})
 
     def handle_oai_request(self, request):
-        url = request.META['HTTP_HOST'] + request.path
+        url         = 'http://' + request.META['HTTP_HOST'] + request.path
         datasource  = TelemetaOAIDataSource()
-        admin = settings.ADMINS[0][1]
+        admin       = settings.ADMINS[0][1]
         provider    = oai.DataProvider(datasource, "Telemeta", url, admin)
-        args = request.GET.copy()
+        args        = request.GET.copy()
         args.update(request.POST)
         return HttpResponse(provider.handle(args), mimetype='text/xml')