From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 8 Nov 2010 13:18:44 +0000 (+0100)
Subject: modify regex code restrictions
X-Git-Tag: 1.1~486^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=62c4c95c4489a4cc7e6d343d10ea72f6c0cd0395;p=telemeta.git

modify regex code restrictions
---

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index a5003d89..ad984a25 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -70,8 +70,8 @@ class MediaCollection(MediaResource):
     element_type = 'collection'
     PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full'))
 
-    published_code_regex   = 'CNRSMH_E_[0-9]{4}(?:_[0-9]{3}){2}'
-    unpublished_code_regex = 'CNRSMH_I_[0-9]{4}_[0-9]{3}'
+    published_code_regex   = '[A-Za-z0-9.]*'
+    unpublished_code_regex = '[A-Za-z0-9.]*'
     code_regex             = '(?:%s|%s)' % (published_code_regex, unpublished_code_regex)
 
     reference             = CharField(_('reference'), unique=True, null=True)
@@ -208,8 +208,8 @@ class MediaItem(MediaResource):
     element_type = 'item'
     PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full'))
 
-    published_code_regex    = MediaCollection.published_code_regex + '(?:_[0-9]{2}){1,2}'
-    unpublished_code_regex  = MediaCollection.unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2}){0,2}'
+    published_code_regex    = '[A-Za-z0-9.]*'
+    unpublished_code_regex  = '[A-Za-z0-9.]*'
     code_regex              = '(?:%s|%s)' % (published_code_regex, unpublished_code_regex)
 
     collection            = ForeignKey('MediaCollection', related_name="items", 
diff --git a/telemeta/templates/telemeta_default/index.html b/telemeta/templates/telemeta_default/index.html
index 0fb65cb0..e81e025d 100644
--- a/telemeta/templates/telemeta_default/index.html
+++ b/telemeta/templates/telemeta_default/index.html
@@ -13,18 +13,7 @@
     <a class="image-link" href="{% url telemeta-geo-continents %}">
     <img class="map-thumbnail" src="{% url telemeta-images "map_thumbnail.png" %}" alt="{% trans "Open the geographic navigator" %}" /></a>
 </div>
-<div class="module">
-    <h3>{% trans "Musical selection" %}</h3>
-    <ul class="playlist">
-    {% for item in items %}
-    <li>
-        <a href="{% url telemeta-item-detail item.public_id %}"><b>{{item}}</b></a>
-        <br />
-        <span class="info">{{item.apparent_collector|prepend:' - '}} - {{item.country_or_continent}}</span>
-    </li>
-    {% endfor %}
-    </ul>
-</div>
+
 {% endblock %}
 
 </div>
diff --git a/telemeta/urls.py b/telemeta/urls.py
index f4a648df..16ccd795 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -61,25 +61,25 @@ urlpatterns = patterns('',
     url(r'^items/$', 'django.views.generic.list_detail.object_list', 
         dict(all_items, paginate_by=20, template_name="telemeta/mediaitem_list.html"),
         name="telemeta-items"),
-    url(r'^items/(?P<public_id>[A-Z0-9_]+)/$', web_view.item_detail, 
+    url(r'^items/(?P<public_id>[A-Za-z0-9.]+)/$', web_view.item_detail, 
         name="telemeta-item-detail"),
-    url(r'^items/(?P<public_id>[A-Z0-9_]+)/dc/$', web_view.item_detail, 
+    url(r'^items/(?P<public_id>[A-Za-z0-9.]+)/dc/$', web_view.item_detail, 
         {'template': 'telemeta/mediaitem_detail_dc.html'},
         name="telemeta-item-dublincore"),
-    url(r'^items/(?P<public_id>[A-Z0-9_]+)/dc/xml/$', web_view.item_detail, 
+    url(r'^items/(?P<public_id>[A-Za-z0-9.]+)/dc/xml/$', web_view.item_detail, 
         {'format': 'dublin_core_xml'},
         name="telemeta-item-dublincore-xml"),
-    url(r'^items/download/(?P<public_id>[A-Z0-9_]+)\.(?P<extension>' 
+    url(r'^items/download/(?P<public_id>[A-Za-z0-9.]+)\.(?P<extension>' 
             + export_extensions + ')$', 
         web_view.item_export,
         name="telemeta-item-export"),
-    url(r'^items/(?P<public_id>[A-Z0-9_]+)/visualize/(?P<visualizer_id>[0-9a-z_]+)/(?P<width>[0-9A-Z]+)x(?P<height>[0-9A-Z]+)/$', 
+    url(r'^items/(?P<public_id>[A-Za-z0-9.]+)/visualize/(?P<visualizer_id>[0-9a-z_]+)/(?P<width>[0-9A-Z]+)x(?P<height>[0-9A-Z]+)/$', 
         web_view.item_visualize,
         name="telemeta-item-visualize"),
-    url(r'^items/(?P<public_id>[A-Z0-9_]+)/analyze/(?P<analyzer_id>[0-9a-z_]+)/$', 
+    url(r'^items/(?P<public_id>[A-Za-z0-9.]+)/analyze/(?P<analyzer_id>[0-9a-z_]+)/$', 
         web_view.item_analyze,
         name="telemeta-item-analyze"),
-    url(r'^items/(?P<public_id>[A-Z0-9_]+)/item_xspf.xml$', 
+    url(r'^items/(?P<public_id>[A-Za-z0-9.]+)/item_xspf.xml$', 
         web_view.item_playlist, 
         dict(template="telemeta/mediaitem_xspf.xml", mimetype="application/xspf+xml"),
         name="telemeta-item-xspf"),
@@ -92,15 +92,15 @@ urlpatterns = patterns('',
     url(r'^collections/?page=(?P<page>[0-9]+)$', 
         'django.views.generic.list_detail.object_list',
         dict(all_collections, paginate_by=20)),
-    url(r'^collections/(?P<public_id>[A-Z0-9_]+)/$', web_view.collection_detail,
+    url(r'^collections/(?P<public_id>[A-Za-z0-9.]+)/$', web_view.collection_detail,
         dict(template="telemeta/collection_detail.html"), name="telemeta-collection-detail"),
-    url(r'^collections/(?P<public_id>[A-Z0-9_]+)/dc/$', web_view.collection_detail,
+    url(r'^collections/(?P<public_id>[A-Za-z0-9.]+)/dc/$', web_view.collection_detail,
         dict(template="telemeta/collection_detail_dc.html"), name="telemeta-collection-dublincore"),
-    url(r'^collections/(?P<public_id>[A-Z0-9_]+)/collection_xspf.xml$', 
+    url(r'^collections/(?P<public_id>[A-Za-z0-9.]+)/collection_xspf.xml$', 
         web_view.collection_playlist, 
         dict(template="telemeta/collection_xspf.xml", mimetype="application/xspf+xml"),
         name="telemeta-collection-xspf"),
-    url(r'^collections/(?P<public_id>[A-Z0-9_]+)/collection.m3u$',
+    url(r'^collections/(?P<public_id>[A-Za-z0-9.]+)/collection.m3u$',
         web_view.collection_playlist, 
         dict(template="telemeta/collection.m3u", mimetype="audio/mpegurl"),
         name="telemeta-collection-m3u"),
@@ -146,7 +146,7 @@ urlpatterns = patterns('',
     url(r'^geo/items/(?P<continent>[a-z_]+)/(?P<country>[a-z_]+)/$', 
         web_view.list_country_items, 
         name="telemeta-geo-country-items"),
-    url(r'^geo/country_info/(?P<id>[0-9A-Z]+)/$', 
+    url(r'^geo/country_info/(?P<id>[0-9a-z]+)/$', 
         web_view.country_info, name="telemeta-country-info"),
 
     # CSS+Images (FIXME: for developement only)