add '+' to code, try default grapher

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 1d5087bfc77264e0b4e9642faef7a21dedfba207..c1acf38b0984019042b0f314dbef68ee8d7d8df8 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -53,13 +53,13 @@ from telemeta.models.format import *
 from telemeta.util.kdenlive.session import *
 from django.db import models
 
-collection_published_code_regex   = '[A-Za-z0-9._-]*'
-collection_unpublished_code_regex = '[A-Za-z0-9._-]*'
+collection_published_code_regex   = '[A-Za-z0-9._+-]*'
+collection_unpublished_code_regex = '[A-Za-z0-9._+-]*'
 collection_code_regex             = '(?:%s|%s)' % (collection_published_code_regex,
                                                     collection_unpublished_code_regex)
 
-item_published_code_regex    = '[A-Za-z0-9._-]*'
-item_unpublished_code_regex  = '[A-Za-z0-9._-]*'
+item_published_code_regex    = '[A-Za-z0-9._+-]*'
+item_unpublished_code_regex  = '[A-Za-z0-9._+-]*'
 item_code_regex              = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
 
 PUBLIC_ACCESS_CHOICES = (('none', _('none')), ('metadata', _('metadata')),

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index fcfcc91fa8215c4684904c2f8f1cae9e09104088..f2e8624323dbd5bdf1499949e8e467ee80aca082 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -117,10 +117,7 @@ class ItemView(object):
         if request.REQUEST.has_key('grapher_id'):
             grapher_id = request.REQUEST['grapher_id']
         else:
-            try:
-                grapher_id = settings.TELEMETA_DEFAULT_GRAPHER_ID
-            except:
-                grapher_id = 'waveform'
+            grapher_id = getattr(settings, 'TELEMETA_DEFAULT_GRAPHER_ID', 'waveform')
 
         previous, next = self.item_previous_next(item)
         mime_type = self.item_analyze(item)