From f369f34c8fbb525e812e71232d97f13e1b0eaea0 Mon Sep 17 00:00:00 2001
From: Martin Green <martin.speleo@gmail.com>
Date: Sun, 10 Jun 2012 17:16:33 +0100
Subject: [PATCH] update caves from new cave file format not cavetab2.csv

---
 databaseReset.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/databaseReset.py b/databaseReset.py
index 00d6a78..e3522b1 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -37,13 +37,6 @@ def make_dirs():
     if not os.path.isdir(settings.PHOTOS_ROOT):
         os.mkdir(settings.PHOTOS_ROOT)
 
-
-
-def import_cavetab():
-    import parsers.cavetab
-    print "importing cavetab"
-    parsers.cavetab.LoadCaveTab()
-
 def import_caves():
     import parsers.caves
     print "importing caves"
@@ -101,7 +94,7 @@ def reset():
     reload_db()
     make_dirs()
     pageredirects()
-    import_cavetab()
+    import_caves()
     import_people()
     import_surveyscans()
     import_survex()
@@ -203,11 +196,6 @@ if __name__ == "__main__":
         resetdesc()
     elif "scans" in sys.argv:
         import_surveyscans()
-    elif "caves" in sys.argv:
-        reload_db()
-        make_dirs()
-        pageredirects()
-        import_cavetab()
     elif "cavesnew" in sys.argv:
         reload_db()
         make_dirs()