summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-04-20 23:57:51 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2021-04-20 23:57:51 +0100
commit18938c9fca5af4ed8e8fe97f101bd5a9870f2b5a (patch)
tree2bea5d8db3bb2ff66dfc06d5fd8e3d422a243ac1 /urls.py
parent8f0e7435d694a96733de7d95b09f317e993e18d6 (diff)
downloadtroggle-18938c9fca5af4ed8e8fe97f101bd5a9870f2b5a.tar.gz
troggle-18938c9fca5af4ed8e8fe97f101bd5a9870f2b5a.tar.bz2
troggle-18938c9fca5af4ed8e8fe97f101bd5a9870f2b5a.zip
more attempts to recognise scotsmen
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/urls.py b/urls.py
index 994b8ab..bfe8d0f 100644
--- a/urls.py
+++ b/urls.py
@@ -78,9 +78,7 @@ trogglepatterns = [
#re_path(r'^accounts/', include('django.contrib.auth.urls')), # from Dj3.0, see site-packages\registration\auth_urls_classes.py
# Persons - nasty surname recognition logic fails for 19 people!
-# re_path(r'^person/(?P<person_id>\d*)/?$', person), makes Ruairidh MacLeod work but kills MacLean
-# re_path(r'^person/(\w+_\w+)$', logbooks.person, name="person"),
- re_path(r'^person/(?P<first_name>[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P<last_name>[a-z\-\']*[^a-zA-Z]*[A-Z]*[a-zA-Z\-&;]*)/?', person, name="person"),
+ re_path(r'^person/(?P<first_name>[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P<last_name>[a-z\-\']*[^a-zA-Z]*[\-]*[A-Z]*[a-zA-Z\-&;]*)/?', person, name="person"),
re_path(r'^personexpedition/(?P<first_name>[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-zA-Z&;]*)/(?P<year>\d+)/?$', personexpedition, name="personexpedition"),
# Expedition master page