Changeset d490e6f


Ignore:
Timestamp:
Jun 20, 2011 2:59:46 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, security, server, social, storage, telecaster, test, video
Children:
94aa630
Parents:
d6820ea
git-author:
yomguy <yomguy@…> (20/06/2011 14:59:46)
git-committer:
yomguy <yomguy@…> (20/06/2011 14:59:46)
Message:

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

Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • INSTALL.rst

    r571bd79 rd490e6f  
    167167    EMAIL_HOST =                    your default SMTP server 
    168168    DEFAULT_FROM_EMAIL =            the default sending email address  
    169      
    170     TELEMETA_OAI_HOST =             the default host name to provide dublin core identifier through the OAI data provider 
    171169    TELEMETA_OAI_REPOSITORY_NAME =  the description of the OAI data provider 
    172170     
  • telemeta/models/media.py

    r698a134 rd490e6f  
    242242    ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items",  
    243243                                           verbose_name=_('population / social group')) 
     244    language              = CharField(_('language')) 
    244245    context_comment       = TextField(_('comments')) 
    245246    moda_execut           = CharField(_('moda_execut')) 
    246     language              = CharField(_('language')) 
    247247     
    248248    # Musical informations 
  • telemeta/urls.py

    rd6820ea rd490e6f  
    3737from django.conf.urls.defaults import * 
    3838from telemeta.models import MediaItem, MediaCollection, MediaItemMarker 
    39 from telemeta.web.base import WebView, LastestChangesFeed 
     39from telemeta.web.base import WebView, LastestRevisionsFeed 
    4040from jsonrpc import jsonrpc_site 
    4141import os.path 
     
    257257     
    258258    # RSS feeds 
    259     url(r'^rss/$', LastestChangesFeed(), name="telemeta-rss"), 
     259    url(r'^rss/$', LastestRevisionsFeed(), name="telemeta-rss"), 
    260260     
    261261    # Not allowed 
  • telemeta/web/base.py

    rd6820ea rd490e6f  
    7373from telemeta.util.logger import Logger 
    7474from telemeta.util.unicode import UnicodeWriter 
    75 from telemeta.util.PyRSS2Gen import * 
    7675from telemeta.cache import TelemetaCache 
    7776import telemeta.web.pages as pages 
     
    850849 
    851850    def handle_oai_request(self, request): 
    852         url         = 'http://' + request.META['HTTP_HOST'] + request.path 
     851        host = request.META['HTTP_HOST'] 
     852        url         = 'http://' + host + request.path 
    853853        datasource  = TelemetaOAIDataSource() 
    854854        admin       = settings.ADMINS[0][1] 
    855         provider    = oai.DataProvider(datasource, settings.TELEMETA_OAI_REPOSITORY_NAME, url, admin) 
     855        provider    = oai.DataProvider(datasource, host, url, admin) 
    856856        args        = request.GET.copy() 
    857857        args.update(request.POST) 
     
    11891189     
    11901190 
    1191 class LastestChangesFeed(Feed): 
    1192     "Render the RSS feed of last revisions" 
     1191class LastestRevisionsFeed(Feed): 
     1192    "the RSS feed of the lastest revisions" 
    11931193         
    11941194    organization = settings.TELEMETA_ORGANIZATION 
Note: See TracChangeset for help on using the changeset viewer.