#67: use the settings.ADMINS option for OAI-PMH admin email ; telemeta now raise...

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 7972430d9cdc8832aa46babec7e5676cbf98abcf..8bcd5f7ce7c782d16b546714b108bf2e57312743 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -12,6 +12,9 @@ from telemeta.models import MediaItem, MediaCollection
 from telemeta.core import ComponentManager
 from telemeta.web import WebView
 import os.path
+import telemeta.config
+
+telemeta.config.check()
 
 # initialization
 comp_mgr = ComponentManager()

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