From 861daee66feb985ccfb9271c211dc1a27263fbf4 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 11 Jul 2011 00:15:59 +0100 Subject: Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. --- databaseReset.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'databaseReset.py') 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: -- cgit v1.2.3