documn improvements

core/views/uploads.py

@@ -481,7 +481,7 @@ def scanupload(request, path=None):
     waldata = read_json()  
  
     jsonfile = Path(settings.DRAWINGS_DATA, "walletjson") / wallet[0:4] / wallet / "contents.json"
-    print(f'! - FORM scanupload - jsonfile {jsonfile}')
+    # print(f'! - FORM scanupload - jsonfile {jsonfile}')
     if not Path(jsonfile).is_file():
         metadataurl = ""
     else:

parsers/caves.py

@@ -82,6 +82,9 @@ def do_pending_cave(k, url, area):
     '''
     default for a PENDING cave, should be overwritten in the db later if a real cave of the same name exists 
     in expoweb/cave_data/1623-"k".html 
+    
+    Note that at this point in importing the data we have not yet seen the survex files, so we can't
+    look inside the relevant survex file to find the year and so we con't provide helpful links.
     '''
     slug = k
     
@@ -98,7 +101,7 @@ def do_pending_cave(k, url, area):
     default_note += f"INSTRUCTIONS: First open 'This survex file' (link above the CaveView panel) to find the date and info. Then " 
     default_note += f"<br><br>\n\n - (1) search in the survex file for the *ref to find a "  
     default_note += f"relevant wallet, e.g.<a href='/survey_scans/2009%252311/'>2009#11</a> and read the notes image files <br>\n - " 
-    default_note += f"<br><br>\n\n - (2) search in the Expo for that year e.g. <a href='/expedition/{k[0:4]}'>{k[0:4]}</a> to find a "  
+    default_note += f"<br><br>\n\n - (2) search in the Expo for that year e.g. <a href='/expedition/2009'>2009</a> to find a "  
     default_note += f"relevant logbook entry, remember that the date may have been recorded incorrectly, " 
     default_note += f"so check for trips i.e. logbook entries involving the same people as were listed in the survex file, " 
     default_note += f"and you should also check the scanned copy of the logbook (linked from each logbook entry page) "