fix depricated import bug

[oweals/karmaworld.git] / karmaworld / urls.py

diff --git a/karmaworld/urls.py b/karmaworld/urls.py
index cde1cd4aa0aaf3fcdbe96c4e1fa612dd8592368d..6e0af643be468675054bc49eb33e6225c101655e 100644 (file)
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@ -4,6 +4,7 @@
 """ Controller for the KarmaNotes website """
 
 from django.contrib import admin
+from django.conf import settings
 from django.conf.urls.defaults import patterns, include, url
 from django.views.generic.simple import direct_to_template
 
@@ -15,10 +16,31 @@ from karmaworld.apps.courses.views import CourseListView
 from karmaworld.apps.courses.views import school_list
 from karmaworld.apps.notes.views import NoteView
 from karmaworld.apps.notes.views import RawNoteDetailView
+from karmaworld.apps.notes.views import PDFView
+from karmaworld.apps.document_upload.views import save_fp_upload
 
 # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
 admin.autodiscover()
 
+# reused named regex capture groups
+SLUG = r'(?P<{0}slug>[-A-Za-z0-9_]+)'
+
+"""
+# ex: SLUG.format('')  :> (?P<slug>[-A-Za-z0-9_]+)
+# ex: SLUG.format('school_')  :> (?P<school_slug>[-A-Za-z0-9_]+)
+
+  ex: course url
+  url(r'^' + SLUG.format('school_') + '/' + SLUG.format('') + '/'
+        CourseDetailView.as_view(), name='course_detail'),
+
+  (?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
+        NoteView.as_view(), name='note_detail_pk'),
+"""
+
+SCHOOL_SLUG = r'(?P<school_slug>[-A-Za-z0-9_]+)'
+COURSE_SLUG = r'(?P<course_slug>[-A-Za-z0-9_]+)'
+NOTE_SLUG   = r'(?P<slug>[-A-Za-z0-9_]+)'
+
 # See: https://docs.djangoproject.com/en/dev/topics/http/urls/
 urlpatterns = patterns('',
     ## Administrative URLpatterns
@@ -34,17 +56,32 @@ urlpatterns = patterns('',
 
     # VIEW for viewing a Note's gdrive generated html, used as iframe
     url(r'^raw/(?P<pk>\d+)$', RawNoteDetailView.as_view(), name='note_raw'),
+    #url(r'^pdfview$', PDFView.as_view(), name='pdf'),
+    url(r'^pdfview/(?P<pk>\d+)$', PDFView.as_view(), name='pdf'),
+
+    # Media handling
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', 
+            {'document_root': settings.MEDIA_ROOT, }),
 
+    # Filepicker upload
+    url(r'^api/upload$', save_fp_upload, name='upload_post'),
     # VIEW for displaying a single Course
-    url(r'^(?P<school_slug>[^/]+)/(?P<slug>[-A-Za-z0-9_]+)$', \
+    url(r'^' + SLUG.format('school_') + '/' + SLUG.format('') + '$',
         CourseDetailView.as_view(), name='course_detail'),
 
+    ## NOTE MODEL
+    # Valid url cases to the Note page
+    # a: school/course/id
+    # b: school/course/id/slug
+    # c: s../c../slug
     # note file as id, for notes without titles yet
     url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
         NoteView.as_view(), name='note_detail_pk'),
     # note file by note.slug
-    url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<slug>[^/]+)$', \
+    url(r'^' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'$',
         NoteView.as_view(), name='note_detail'),
+    #url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<slug>[^/]+)$', \
+    #    NoteView.as_view(), name='note_detail'),
 
     # ---- JSON views ----#
     # uploading files