Replace assert() with DataIssue message

5 files changed, 16 insertions, 70 deletions

diff --git a/core/TESTS/tests.py b/core/TESTS/tests.py
index 8fdc581..85d6c44 100644
--- a/core/TESTS/tests.py
+++ b/core/TESTS/tests.py
@@ -118,7 +118,7 @@ class PageTests(TestCase):
         h1    = re.search(r'<h1 id="site-name">Troggle administration</h1>', content)
 
     def test_page_admindocs(self):
-       response = self.client.get('/admin/login/models/')
+        response = self.client.get('/admin/login/models/')
         content = response.content.decode()
         self.assertEqual(response.status_code, 200)
         h1    = re.search(r'<h1>Model documentation</h1>', content)
diff --git a/core/models.py b/core/models.py
index eb8428d..9fa7cec 100644
--- a/core/models.py
+++ b/core/models.py
@@ -112,8 +112,12 @@ class Expedition(TroggleModel):
     def get_expedition_day(self, date):
         expeditiondays = self.expeditionday_set.filter(date=date)
         if expeditiondays:
-            assert len(expeditiondays) == 1
-            return expeditiondays[0]
+            if len(expeditiondays) == 1:
+                return expeditiondays[0]
+            else:
+                message ='! - more than one datum in an expeditionday: {}'.format(date)
+                DataIssue.objects.create(parser='expedition', message=message)
+                return expeditiondays[0]
         res = ExpeditionDay(expedition=self, date=date)
         res.save()
         return res
diff --git a/core/view_surveys.py b/core/view_surveys.py
index 9b9c533..6aaa9dc 100644
--- a/core/view_surveys.py
+++ b/core/view_surveys.py
@@ -59,8 +59,9 @@ def tunnelfileupload(request, path):
     print((project, user, tunnelversion))
     
     
-    assert len(list(request.FILES.values())) == 1, "only one file to upload"
-    
+    if not (len(list(request.FILES.values())) == 1): # "only one file to upload"
+         return HttpResponse(content="Error: more than one file selected for upload", content_type="text/plain")
+       
     uploadedfile = list(request.FILES.values())[0]
         
     if uploadedfile.field_name != "sketch":
diff --git a/core/views_other.py b/core/views_other.py
index 0b3e6c3..5b9303c 100644
--- a/core/views_other.py
+++ b/core/views_other.py
@@ -140,70 +140,13 @@ def ajax_QM_number(request):
     return HttpResponse(res)
 
 
-# def logbook_entry_suggestions(request):
-    # """
-    # Generates a html box with suggestions about what to do with QMs
-    # in logbook entry text.
-    # """
-    # unwiki_QM_pattern=r"(?P<whole>(?P<explorer_code>[ABC]?)(?P<cave>\d*)-?(?P<year>\d\d\d?\d?)-(?P<number>\d\d)(?P<grade>[ABCDXV]?))"
-    # unwiki_QM_pattern=re.compile(unwiki_QM_pattern)
-    # #wikilink_QM_pattern=settings.QM_PATTERN
-    
-    # slug=request.POST['slug']
-    # date=request.POST['date']
-    # lbo=LogbookEntry.objects.get(slug=slug, date=date)
-    
-    # #unwiki_QMs=re.findall(unwiki_QM_pattern,lbo.text)
-    # unwiki_QMs=[m.groupdict() for m in unwiki_QM_pattern.finditer(lbo.text)]
-    
-    # print(unwiki_QMs)
-    # for qm in unwiki_QMs:
-        # #try:
-            # if len(qm['year'])==2:
-                # if int(qm['year'])<50:
-                    # qm['year']='20'+qm['year']
-                # else:
-                    # qm['year']='19'+qm['year']
-
-            # if lbo.date.year!=int(qm['year']):
-                # try:
-                    # lbo=LogbookEntry.objects.get(date__year=qm['year'],title__icontains="placeholder for QMs in")
-                # except:
-                    # print(("failed to get placeholder for year "+str(qm['year'])))
-            
-            # temp_QM=QM(found_by=lbo,number=qm['number'],grade=qm['grade'])
-            # temp_QM.grade=qm['grade']
-            # qm['wikilink']=temp_QM.wiki_link()
-        # #except:
-            # #print 'failed'
-
-    # print(unwiki_QMs)
-    
-    
-    # #wikilink_QMs=re.findall(wikilink_QM_pattern,lbo.text)
-    # attached_QMs=lbo.QMs_found.all()
-    # unmentioned_attached_QMs=''#not implemented, fill this in by subtracting wiklink_QMs from attached_QMs
-    
-    # #Find unattached_QMs. We only look at the QMs with a proper wiki link.
-    # #for qm in wikilink_QMs:
-        # #Try to look up the QM. 
-        
-    # print('got 208')
-    # any_suggestions=True
-    # print('got 210')
-    # return render(request,'suggestions.html',
-        # {
-        # 'unwiki_QMs':unwiki_QMs,
-        # 'any_suggestions':any_suggestions
-        # })
-
 print(" -  newFile() is next in troggle/core/views_other.py")
 
 @login_required_if_public
 def newFile(request, pslug = None):
     if pslug:
         previousfile = LogbookEntry.objects.get(slug = pslug, date = previousdate, expedition = expedition)
-        assert previousfile.filename
+        #assert previousfile.filename
     if request.method == 'POST': # If the form has been submitted...
         tripForm = TripForm(request.POST) # A form bound to the POST data
         personTripFormSet = PersonTripFormSet(request.POST)
@@ -235,10 +178,7 @@ def newFile(request, pslug = None):
         else:        
             fileform = UploadFileForm() # An unbound form
 
-    return render(request, 'editfile.html', {
-        'fileForm': fileform,
-
-    })
+    return render(request, 'editfile.html', {'fileForm': fileform, })
 
 @login_required_if_public
 def deleteFile(request, expeditionyear, date = None, slug = None):
diff --git a/core/views_survex.py b/core/views_survex.py
index 87f4430..0c05697 100644
--- a/core/views_survex.py
+++ b/core/views_survex.py
@@ -272,7 +272,7 @@ def identifycavedircontents(gcavedir):
     subdirs = [ ]
     subsvx = [ ]
     primesvx = None
-    for f in os.listdir(gcavedir):
+    for f in os.listdir(gcavedir): # These may get outdated as data gets tidied up. This should not be in the code!
         if name == "204" and (f in ["skel.svx", "template.svx", "204withents.svx"]):
             pass
         elif name == "136" and (f in ["136-noents.svx"]):
@@ -289,10 +289,11 @@ def identifycavedircontents(gcavedir):
             if nf.lower() == name.lower() or nf[:3] == "all" or (name, nf) in [("resurvey2005", "145-2005"), ("cucc", "cu115")]:
                 if primesvx:
                     if nf[:3] == "all":
-                        assert primesvx[:3] != "all", (name, nf, primesvx, gcavedir, subsvx)
+                        #assert primesvx[:3] != "all", (name, nf, primesvx, gcavedir, subsvx)
                         primesvx = nf
                     else:
-                        assert primesvx[:3] == "all", (name, nf, primesvx, gcavedir, subsvx)
+                        #assert primesvx[:3] == "all", (name, nf, primesvx, gcavedir, subsvx)
+                        pass
                 else:
                     primesvx = nf
             else: