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: [PATCH] more attempts to recognise scotsmen
---
core/views/logbooks.py | 2 +-
urls.py | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/views/logbooks.py b/core/views/logbooks.py
index 394add7..74da4f6 100644
--- a/core/views/logbooks.py
+++ b/core/views/logbooks.py
@@ -119,7 +119,7 @@ def person(request, first_name='', last_name='', ):
this_person = Person.objects.get(first_name = first_name, last_name = last_name)
return render(request,'person.html', {'person': this_person, })
except:
- message = f'Person not found \'{first_name}-{last_name}\' - possibly Scottish? (We have a name parser issue with Mc, Mac etc.)'
+ message = f'Person not found \'{first_name} {last_name}\' - possibly Scottish? (We have a name parser issue with Mc, Mac etc.)'
return render(request, 'errors/generic.html', {'message': message})
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