New cacheing for parsed logbooks. All logbooks load in 75 seconds now.

databaseReset.py

@@ -127,7 +127,7 @@ def import_auto_logbooks():
                 print(os.path.join(root, filename))
                 parsers.logbooks.parseAutoLogBookEntry(os.path.join(root, filename))
 
-#Temporary function until definative source of data transfered.
+#Temporary function until definitive source of data transfered.
 from django.template.defaultfilters import slugify
 from django.template import Context, loader
 def dumplogbooks():
@@ -177,16 +177,16 @@ def usage():
              caves    - read in the caves 
              folklog  - read in the people (folk) and then the logbooks
              logbooks - read in just the logbooks
-             autologbooks - read in autologbooks
+             autologbooks - read in autologbooks (what are these?)
              dumplogbooks - write out autologbooks (not working?)
              people   - read in the people from folk.csv
              QMs      - read in the QM files
              resetend
              scans   - NOT the scanned surveynotes ?!
-             survex   - read in the survex files
-             survexpos
+             survex   - read in the survex files - all the survex blocks
+             survexpos - just the Pos out of the survex files
              surveys  - read in the scanned surveynotes
-             tunnel   - read in the Tunnel files
+             tunnel   - read in the Tunnel files - which scans the surveyscans too
              """)
 
 if __name__ == "__main__":
@@ -214,10 +214,7 @@ if __name__ == "__main__":
     elif "resetend" in sys.argv:
         #import_logbooks()
         import_QMs()
-        try:
-            import_tunnelfiles()
-        except:
-            print("Tunnel files parser broken.")
+        import_tunnelfiles()
         import_surveys()
         import_descriptions()
         parse_descriptions()