Merge branch 'master' of ligo-vcs.phys.uwm.edu:/usr/local/git/gracedb

gracedb/urls.py

@@ -9,12 +9,12 @@ urlpatterns = patterns('gracedb.views',
     url (r'^$', 'index', name="home"),
     url (r'^create/$', 'create', name="create"),
     url (r'^search/(?P<format>(json|flex))?$', 'search', name="search"),
-    url (r'^view/(?P<graceid>[\w\d]+)', 'view', name="view"),
-    url (r'^voevent/(?P<graceid>[\w\d]+)', 'voevent', name="voevent"),
-    url (r'^skyalert/(?P<graceid>[\w\d]+)', 'skyalert', name="skyalert"),
-    url (r'^(?P<graceid>[\w\d]+)$', 'view', name="view2"),
-    url (r'^(?P<graceid>[\w\d]+)/files/(?P<filename>.*)$', download, name="file"),
-    url (r'^(?P<graceid>[\w\d]+)/log/(?P<num>([\d]*|preview))$', 'logentry', name="logentry"),
+    url (r'^view/(?P<graceid>[GEHT]\d+)', 'view', name="view"),
+    url (r'^voevent/(?P<graceid>[GEHT]\d+)', 'voevent', name="voevent"),
+    url (r'^skyalert/(?P<graceid>[GEHT]\d+)', 'skyalert', name="skyalert"),
+    url (r'^(?P<graceid>[GEHT]\d+)$', 'view', name="view2"),
+    url (r'^(?P<graceid>[GEHT]\d+)/files/(?P<filename>.*)$', download, name="file"),
+    url (r'^(?P<graceid>[GEHT]\d+)/log/(?P<num>([\d]*|preview))$', 'logentry', name="logentry"),
 
 
 #   (r'^view/(?P<uid>[\w\d]+)', 'view'),