From 18938c9fca5af4ed8e8fe97f101bd5a9870f2b5a Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Tue, 20 Apr 2021 23:57:51 +0100
Subject: more attempts to recognise scotsmen

---
 urls.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'urls.py')

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
-- 
cgit v1.2.3