bin Makesurvexstation, survextitle, survexEquate

core/views_survex.py

@@ -14,12 +14,11 @@ from django.http import HttpResponse, Http404
 import troggle.settings as settings
 import parsers.survex
 from troggle.core.models import Expedition, Person, PersonExpedition 
-from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory, SurvexTitle
+from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory #, SurvexTitle
 from troggle.core.models_caves import Cave, PersonTrip, LogbookEntry
 from troggle.parsers.people import GetPersonExpeditionNameLookup
 
 
-
 survextemplatefile = """; *** DO NOT SAVE THIS FILE WITHOUT RENAMING IT !! ***
 ;[Stuff in square brackets is example text to be replaced with real data, 
 ; removing the square brackets]
@@ -184,7 +183,6 @@ def svx(request, survex_file):
             if "diff" in rform.data:
                 form.data['code'] = rcode
     
-    
     #process(survex_file)
     if 'code' not in form.data:    
         form.data['code'] = form.GetDiscCode()
@@ -231,19 +229,19 @@ def threed(request, survex_file):
         log = open(settings.SURVEX_DATA + survex_file + ".log", "rt",encoding='utf8')
         return HttpResponse(log, content_type="text")
 
+
 def log(request, survex_file):
     process(survex_file)
     log = open(settings.SURVEX_DATA + survex_file + ".log", "rt",encoding='utf8')
     return HttpResponse(log, content_type="text")
 
+
 def err(request, survex_file):
     process(survex_file)
     err = open(settings.SURVEX_DATA + survex_file + ".err", "rt",encoding='utf8')
     return HttpResponse(err, content_type="text")
 
 
-
-
 def identifycavedircontents(gcavedir):
     # find the primary survex file in each cave directory
     name = os.path.split(gcavedir)[1]
@@ -339,6 +337,8 @@ def survexcaveslist(request):
 
 # parsing all the survex files of a single cave and showing that it's consistent and can find all the files and people
 # doesn't use recursion.  just writes it twice
+
+# currently produces title and blank page.. link test is "dates and explorers"
 def survexcavesingle(request, survex_cave):
     breload = False
     cave = Cave.objects.get(kataster_number=survex_cave)