Changeset d490e6f

Timestamp:

06/20/11 14:59:46 (2 years ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

94aa630

Parents:

d6820ea

git-author:

yomguy <yomguy@…> (06/20/11 14:59:46)

git-committer:

yomguy <yomguy@…> (06/20/11 14:59:46)

Message:

cleanup RSS objects, remove TELEMETA_OAI_HOST global parameter (not needed anymore in settings)

Files:

• INSTALL.rst (modified) (1 diff)
• telemeta/models/media.py (modified) (1 diff)
• telemeta/urls.py (modified) (2 diffs)
• telemeta/util/PyRSS2Gen.py (deleted)
• telemeta/web/base.py (modified) (3 diffs)

INSTALL.rst

@@ -167 +167 @@
     EMAIL_HOST =                    your default SMTP server
     DEFAULT_FROM_EMAIL =            the default sending email address 
-    
-    TELEMETA_OAI_HOST =             the default host name to provide dublin core identifier through the OAI data provider
     TELEMETA_OAI_REPOSITORY_NAME =  the description of the OAI data provider
     

telemeta/models/media.py

@@ -242 +242 @@
     ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items", 
                                            verbose_name=_('population / social group'))
+    language              = CharField(_('language'))
     context_comment       = TextField(_('comments'))
     moda_execut           = CharField(_('moda_execut'))
-    language              = CharField(_('language'))
     
     # Musical informations

telemeta/urls.py

@@ -37 +37 @@
 from django.conf.urls.defaults import *
 from telemeta.models import MediaItem, MediaCollection, MediaItemMarker
-from telemeta.web.base import WebView, LastestChangesFeed
+from telemeta.web.base import WebView, LastestRevisionsFeed
 from jsonrpc import jsonrpc_site
 import os.path
@@ -257 +257 @@
     
     # RSS feeds
-    url(r'^rss/$', LastestChangesFeed(), name="telemeta-rss"),
+    url(r'^rss/$', LastestRevisionsFeed(), name="telemeta-rss"),
     
     # Not allowed

telemeta/web/base.py

@@ -73 +73 @@
 from telemeta.util.logger import Logger
 from telemeta.util.unicode import UnicodeWriter
-from telemeta.util.PyRSS2Gen import *
 from telemeta.cache import TelemetaCache
 import telemeta.web.pages as pages
@@ -850 +849 @@
 
     def handle_oai_request(self, request):
-        url         = 'http://' + request.META['HTTP_HOST'] + request.path
+        host = request.META['HTTP_HOST']
+        url         = 'http://' + host + request.path
         datasource  = TelemetaOAIDataSource()
         admin       = settings.ADMINS[0][1]
-        provider    = oai.DataProvider(datasource, settings.TELEMETA_OAI_REPOSITORY_NAME, url, admin)
+        provider    = oai.DataProvider(datasource, host, url, admin)
         args        = request.GET.copy()
         args.update(request.POST)
@@ -1189 +1189 @@
     
 
-class LastestChangesFeed(Feed):
-    "Render the RSS feed of last revisions"
+class LastestRevisionsFeed(Feed):
+    "the RSS feed of the lastest revisions"
         
     organization = settings.TELEMETA_ORGANIZATION