Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags.

databaseReset.py

@@ -8,6 +8,7 @@ from django.db import connection
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from  django.core.urlresolvers import reverse
+from core.models import Cave, Entrance
 import flatpages.models
 
 
@@ -43,6 +44,11 @@ def import_cavetab():
     print "importing cavetab"
     parsers.cavetab.LoadCaveTab()
 
+def import_caves():
+    import parsers.caves
+    print "importing caves"
+    parsers.caves.readcaves()
+
 def import_people():
     import parsers.people
     parsers.people.LoadPersonsExpos()
@@ -101,7 +107,10 @@ def reset():
     import_survex()
     import_logbooks()
     import_QMs()
-    import_tunnelfiles()
+    try:
+        import_tunnelfiles()
+    except:
+        print "Tunnel files parser broken."
     
     import_surveys()
     import_descriptions()
@@ -180,6 +189,13 @@ def pageredirects():
         f = flatpages.models.Redirect(originalURL = oldURL, newURL = newURL)
         f.save()
 
+def writeCaves():
+    for cave in Cave.objects.all():
+        cave.writeDataFile()
+    for entrance in Entrance.objects.all():
+        entrance.writeDataFile()
+    
+
 if __name__ == "__main__":
     import core.models
     import sys
@@ -192,6 +208,11 @@ if __name__ == "__main__":
         make_dirs()
         pageredirects()
         import_cavetab()
+    elif "cavesnew" in sys.argv:
+        reload_db()
+        make_dirs()
+        pageredirects()
+        import_caves()
     elif "QMs" in sys.argv:
         import_QMs()
     elif "tunnel" in sys.argv:
@@ -201,7 +222,10 @@ if __name__ == "__main__":
     elif "survex" in sys.argv:
         management.call_command('syncdb', interactive=False)  # this sets the path so that import settings works in import_survex
         import_survex()
-    
+    elif "survexpos" in sys.argv:
+        management.call_command('syncdb', interactive=False)  # this sets the path so that import settings works in import_survex
+        import parsers.survex
+        parsers.survex.LoadPos()    
     elif "logbooks" in sys.argv:
         management.call_command('syncdb', interactive=False)  # this sets the path so that import settings works in import_survex
         import_logbooks()
@@ -209,6 +233,8 @@ if __name__ == "__main__":
         import_auto_logbooks()
     elif "dumplogbooks" in sys.argv:
         dumplogbooks()
+    elif "writeCaves" in sys.argv:
+        writeCaves()
     else:
         print "Do 'python databaseReset.py reset'"