Merge in Sam's parser debugging

4 files changed, 12 insertions, 2 deletions

diff --git a/parsers/caves.py b/parsers/caves.py
index d4d53cd..5c4ceb5 100644
--- a/parsers/caves.py
+++ b/parsers/caves.py
@@ -13,7 +13,8 @@ def readcaves():
   print "Reading Entrances"
   #print "list of <Slug> <Filename>"
   for filename in os.walk(settings.ENTRANCEDESCRIPTIONS).next()[2]: #Should be a better way of getting a list of files
-    readentrance(filename)
+    if filename.endswith('.html'):
+        readentrance(filename)
   print "Reading Caves"
   for filename in os.walk(settings.CAVEDESCRIPTIONS).next()[2]: #Should be a better way of getting a list of files
     readcave(filename)
diff --git a/parsers/survex.py b/parsers/survex.py
index 1450255..035c21e 100644
--- a/parsers/survex.py
+++ b/parsers/survex.py
@@ -231,6 +231,9 @@ def ReloadSurvexCave(survex_cave):
 
 
 def LoadAllSurvexBlocks():
+
+    print 'Loading All Survex Blocks...'
+
     models.SurvexBlock.objects.all().delete()
     models.SurvexFile.objects.all().delete()
     models.SurvexDirectory.objects.all().delete()
@@ -265,6 +268,9 @@ def LoadAllSurvexBlocks():
     
 poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$")
 def LoadPos():
+
+    print 'Loading Pos....'
+
     call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA])
     call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA)
     posfile = open("%sall.pos" % settings.SURVEX_DATA)
diff --git a/parsers/surveys.py b/parsers/surveys.py
index fc5b865..07e8cc2 100644
--- a/parsers/surveys.py
+++ b/parsers/surveys.py
@@ -189,6 +189,9 @@ def LoadListScansFile(survexscansfolder):
 # this iterates through the scans directories (either here or on the remote server)
 # and builds up the models we can access later
 def LoadListScans():
+
+    print 'Loading Survey Scans...'
+
     SurvexScanSingle.objects.all().delete()
     SurvexScansFolder.objects.all().delete()
 
diff --git a/templates/base.html b/templates/base.html
index 63724ee..7c912a0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -38,9 +38,9 @@
     <a href="{% url survexcavessingle 161 %}">161</a> | 
     <a href="{% url survexcavessingle 204 %}">204</a> | 
     <a href="{% url survexcavessingle 258 %}">258</a> | 
-    <a href="{% url expedition 2011 %}">Expo2011</a> | 
     <a href="{% url expedition 2012 %}">Expo2012</a> | 
     <a href="{% url expedition 2013 %}">Expo2013</a> | 
+    <a href="{% url expedition 2014 %}">Expo2014</a> | 
  
     <a href="/admin/">Django admin</a>
 </div>