1 files changed, 16 insertions, 1 deletions
diff --git a/databaseReset.py b/databaseReset.py
index cdd7dcf..52a646c 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -7,6 +7,8 @@ from django.core import management
 from django.db import connection
 from django.contrib.auth.models import User
 from django.http import HttpResponse
+from  django.core.urlresolvers import reverse
+import flatpages.models
 
 
 
@@ -59,6 +61,7 @@ def import_logbooks():
 def import_survex():
     import parsers.survex
     parsers.survex.LoadAllSurvexBlocks()
+    parsers.survex.LoadPos()
 
 def import_QMs():
     import parsers.QMs
@@ -91,6 +94,7 @@ def reset():
     """
     reload_db()
     make_dirs()
+    pageredirects()
     import_cavetab()
     import_people()
     import_surveyscans()
@@ -98,7 +102,8 @@ def reset():
     import_logbooks()
     import_QMs()
     import_tunnelfiles()
-    #import_surveys()
+    
+    import_surveys()
     import_descriptions()
     parse_descriptions()
 
@@ -170,6 +175,11 @@ def dumplogbooks():
             f.write(unicode(output).encode( "utf-8" ))
             f.close()
 
+def pageredirects():
+    for oldURL, newURL in [("indxal.htm", reverse("caveindex"))]:
+        f = flatpages.models.Redirect(originalURL = oldURL, newURL = newURL)
+        f.save()
+
 if __name__ == "__main__":
     import core.models
     import sys
@@ -177,6 +187,11 @@ if __name__ == "__main__":
         resetdesc()
     elif "scans" in sys.argv:
         import_surveyscans()
+    elif "caves" in sys.argv:
+        reload_db()
+        make_dirs()
+        pageredirects()
+        import_cavetab()
     elif "QMs" in sys.argv:
         import_QMs()
     elif "tunnel" in sys.argv: