Scan Upload working nicely

1 files changed, 6 insertions, 6 deletions

diff --git a/urls.py b/urls.py
index 14aa34a..4b4ccf8 100644
--- a/urls.py
+++ b/urls.py
@@ -78,7 +78,7 @@ trogglepatterns = [
     re_path(r'^admin/doc/',  include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/).
     re_path(r'^admin/',      admin.site.urls), # includes admin login & logout urls
     
-    path('scanupload',      scanupload, name='scanupload'), 
+    path('scanupload/<wallet>',      scanupload, name='scanupload'), 
 
 # setting LOGIN_URL = '/accounts/login/' is default
 # url ENDS WITH this string
@@ -129,9 +129,9 @@ trogglepatterns = [
     path('pathsreport', statistics.pathsreport, name="pathsreport"),
     path('dataissues',  statistics.dataissues,  name="dataissues"),
 
-    path(r'troggle',            frontpage,     name="frontpage"), # control panel. Shows recent actions.
-    path(r'todo/<path:module>', todos,         name="todos"),
-    path(r'controlpanel',       controlpanel,  name="controlpanel"),
+    path('troggle',            frontpage,     name="frontpage"), # control panel. Shows recent actions.
+    path('todo/<path:module>', todos,         name="todos"),
+    path('controlpanel',       controlpanel,  name="controlpanel"),
 
 # The survexfile pages
     path('survexfile',                    survex.survexcavesingle, {'survex_cave': ''},   name="survexcavessingle"),
@@ -148,8 +148,8 @@ trogglepatterns = [
 
 # The survey scans in the wallets
     path('survey_scans/',               allwallets,   name="allwallets"), 
-    path('survey_scans/<path>/',        singlewallet, name="singlewallet"),
-    path('survey_scans/<path>/<file>',  scansingle,   name="scansingle"), 
+    path('survey_scans/<path:path>/',        singlewallet, name="singlewallet"),
+    path('survey_scans/<path:path>/<file>',  scansingle,   name="scansingle"), 
 
 # The tunnel and therion drawings files pages
     re_path(r'^dwgdata/$',                             dwgdata,           name="dwgdata"),