From 9dc1853e10206fb99e3a9761d692f537bdda8878 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Thu, 29 Dec 2022 13:56:09 +0000
Subject: [PATCH] cope with bad wallet name

---
 core/views/uploads.py       | 15 +++++++++------
 templates/wallet_table.html |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/views/uploads.py b/core/views/uploads.py
index 6eaadc6..648e340 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -676,12 +676,15 @@ def scanupload(request, path=None):
                  checked[f] = "checked"
                  
         survexsize =  str(min(len(str(waldata["survex file"])), 46))
-                 
-        thiswallet = Wallet.objects.get(walletname=wallet)
-        caveifywallet(thiswallet)
-        thiswallet.ticks = thiswallet.get_ticks() # the complaints in colour form
-        #fixsurvextick(thiswallet, thiswallet.ticks)
-        print(thiswallet)
+        
+        try:
+            thiswallet = Wallet.objects.get(walletname=wallet)
+            caveifywallet(thiswallet)
+            thiswallet.ticks = thiswallet.get_ticks() # the complaints in colour form
+            #fixsurvextick(thiswallet, thiswallet.ticks)
+            print(thiswallet)
+        except:
+            thiswallet = None
         context = {'year': year, 'prev': prev, 'next': next, 'prevy': prevy, 'nexty': nexty,
                 'files': files, 'dirs': dirs, 'waldata': waldata, 'svxfiles': svxfiles,
                 'checked': checked,
diff --git a/templates/wallet_table.html b/templates/wallet_table.html
index 3f033ce..bb84f52 100644
--- a/templates/wallet_table.html
+++ b/templates/wallet_table.html
@@ -49,7 +49,7 @@
     <td style="padding:1px; background-color:{{wallet.ticks.T}}" title="Tunnel or Therion done">&nbsp;</td>
     <td style="padding:1px; background-color:{{wallet.ticks.W}}" title="Website updated">&nbsp;</td>
   </tr>
-{% empty %} <h2>No Wallets for this year</h2>
+{% empty %} <h2>No Wallet found</h2>
 <b>Before 1998</b> we used a survey book system, not wallets. But 1983 has some scraps recreated as wallets.
 <p>That is probably why you cannot see anything here. Look at the complete list of scanned files instead, 
 at <a href="/survey_scans/">Scans</a> (it is slow, so be patient).