From 392870af5aedc209d8e5b44361a304a87f654ee7 Mon Sep 17 00:00:00 2001
From: almelid <almelid@pvv.ntnu.no>
Date: Sun, 6 Mar 2011 12:17:08 +0000
Subject: [PATCH] Modifisert urls.py slik at den matcher urls.txt

---
 python/web/urls.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/web/urls.py b/python/web/urls.py
index 4ed71ef..9da772d 100644
--- a/python/web/urls.py
+++ b/python/web/urls.py
@@ -12,10 +12,10 @@ urlpatterns = patterns('',
     # to INSTALLED_APPS to enable admin documentation:
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^media/(?P<path>.*)$','django.views.static.serve',{'document_root' : settings.MEDIA_ROOT}),
-    (r'^book/(?P<book_identifier>\d+)/$','web.library.views.BookView'),
-    (r'^book/(?P<book_identifier>\S+)/$','web.library.views.BookRedirect'),
+    (r'^bok/(?P<book_identifier>\d+)/$','web.library.views.BookView'),
+    (r'^bok/(?P<book_identifier>\S+)/$','web.library.views.BookRedirect'),
     (r'^person/(?P<person_identifier>\S+)/$','web.library.views.PersonView'),
-    (r'^map/(?P<shelf_identifier>\S+)/$', 'web.library.views.MapView'),
+    (r'^kart/(?P<shelf_identifier>\S+)/$', 'web.library.views.MapView'),
     # Uncomment the next line to enable the admin:
     (r'^admin/', include(admin.site.urls)),
 )