From 65c55f0f21fe85a678d48842da10e0ea5c917ae5 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 11 Jul 2011 00:15:59 +0100 Subject: [PATCH] Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. --- databaseReset.py | 17 ++++- parsers/cavetab.py | 35 +++++---- settings.py | 1 + templates/base.html | 2 +- templates/cave.html | 153 +++++++++++++++++++++++-------------- templates/cavebase.html | 52 ++++++------- templates/caveindex.html | 26 +++++-- templates/editcave.html | 19 +++++ templates/expowebbase.html | 40 ++++++++++ templates/flatpage.html | 2 +- 10 files changed, 237 insertions(+), 110 deletions(-) create mode 100644 templates/editcave.html create mode 100644 templates/expowebbase.html 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: diff --git a/parsers/cavetab.py b/parsers/cavetab.py index bf61d7f..68ea4b3 100644 --- a/parsers/cavetab.py +++ b/parsers/cavetab.py @@ -3,7 +3,8 @@ import troggle.core.models as models from django.conf import settings import csv, time, re, os, logging from utils import save_carefully -from utils import html_to_wiki +from django.core.urlresolvers import reverse +import flatpages.models ##format of CAVETAB2.CSV is KatasterNumber = 0 @@ -54,6 +55,7 @@ Findability = 44 FindabilityComment = 45 def LoadCaveTab(): + cavetab = open(os.path.join(settings.EXPOWEB, "noinfo", "CAVETAB2.CSV"),'rU') caveReader = csv.reader(cavetab) caveReader.next() # Strip out column headers @@ -76,14 +78,14 @@ def LoadCaveTab(): if line[MultipleEntrances] == 'yes' or line[MultipleEntrances]=='': #When true, this line contains an actual cave, otherwise it is an extra entrance. args = {} defaultArgs = {} - + def addToArgs(CSVname, modelName): if line[CSVname]: - args[modelName] = html_to_wiki(line[CSVname]) + args[modelName] = line[CSVname] def addToDefaultArgs(CSVname, modelName): #This has to do with the non-destructive import. These arguments will be passed as the "default" dictionary in a get_or_create if line[CSVname]: - defaultArgs[modelName] = html_to_wiki(line[CSVname]) + defaultArgs[modelName] = line[CSVname] # The attributes added using "addToArgs" will be used to look up an existing cave. Those added using "addToDefaultArgs" will not. addToArgs(KatasterNumber, "kataster_number") @@ -103,6 +105,7 @@ def LoadCaveTab(): addToDefaultArgs(Extent, "extent") addToDefaultArgs(SurvexFile, "survex_file") addToDefaultArgs(Notes, "notes") + addToDefaultArgs(AutogenFile, "url") if line[Area] == "1626": if line[KatasterNumber] != "": args["slug"] = line[Area] + "-" + line[KatasterNumber] @@ -140,6 +143,7 @@ def LoadCaveTab(): newArea = models.Area(short_name = line[Area], parent = area1623) newArea.save() newCave.area.add(newArea) + newCave.area.add(area1623) elif created: newCave.area.add(area1623) @@ -152,6 +156,7 @@ def LoadCaveTab(): newUnofficialName.save() logging.info("Added unofficial name "+str(newUnofficialName)+" to cave "+str(newCave)+"\n") + if created and line[MultipleEntrances] == '' or \ line[MultipleEntrances] == 'entrance' or \ @@ -165,10 +170,10 @@ def LoadCaveTab(): def addToArgs(CSVname, modelName): if line[CSVname]: - args[modelName] = html_to_wiki(line[CSVname]) + args[modelName] = line[CSVname] def addToArgsViaDict(CSVname, modelName, dictionary): if line[CSVname]: - args[modelName] = dictionary[html_to_wiki(line[CSVname])] + args[modelName] = dictionary[line[CSVname]] addToArgs(EntranceName, 'name') addToArgs(Explorers, 'explorers') addToArgs(Map, 'map_description') @@ -188,6 +193,7 @@ def LoadCaveTab(): "Unmarked": "U", "": "?", }) + addToArgs(MarkingComment, 'marking_comment') addToArgsViaDict(Findability, 'findability', {"Surveyed": "S", "Lost": "L", @@ -200,20 +206,15 @@ def LoadCaveTab(): addToArgs(Northing, 'northing') addToArgs(Altitude, 'alt') addToArgs(DescriptionOfOtherPoint, 'other_description') - def addToArgsSurveyStation(CSVname, modelName): - if line[CSVname]: - surveyPoint = models.SurveyStation(name = line[CSVname]) - surveyPoint.save() - args[modelName] = surveyPoint - addToArgsSurveyStation(TagPoint, 'tag_station') - addToArgsSurveyStation(ExactEntrance, 'exact_station') - addToArgsSurveyStation(OtherPoint, 'other_station') + addToArgs(TagPoint, 'tag_station') + addToArgs(ExactEntrance, 'exact_station') + addToArgs(OtherPoint, 'other_station') addToArgs(OtherPoint, 'other_description') if line[GPSpreSA]: - addToArgsSurveyStation(GPSpreSA, 'other_station') + addToArgs(GPSpreSA, 'other_station') args['other_description'] = 'pre selective availability GPS' if line[GPSpostSA]: - addToArgsSurveyStation(GPSpostSA, 'other_station') + addToArgs(GPSpostSA, 'other_station') args['other_description'] = 'post selective availability GPS' addToArgs(Bearings, 'bearings') args['slug'] = newCave.slug + entrance_letter @@ -227,6 +228,8 @@ def LoadCaveTab(): newCaveAndEntrance.save() logging.info("Added CaveAndEntrance "+str(newCaveAndEntrance)+"\n") + f = flatpages.models.EntranceRedirect(originalURL = line[AutogenFile], entrance = newEntrance) + f.save() # lookup function modelled on GetPersonExpeditionNameLookup diff --git a/settings.py b/settings.py index ef24512..50fbbae 100644 --- a/settings.py +++ b/settings.py @@ -92,6 +92,7 @@ INSTALLED_APPS = ( 'troggle.registration', 'troggle.profiles', 'troggle.core', + 'troggle.flatpages', 'troggle.imagekit', ) diff --git a/templates/base.html b/templates/base.html index 6a4da29..d3341b2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,7 +1,7 @@ - + diff --git a/templates/cave.html b/templates/cave.html index 9469118..12e83b4 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -1,10 +1,92 @@ {% extends "cavebase.html" %} -{% load wiki_markup %} -{% block editLink %}| Edit cave {{cave|wiki_to_html_short}}{% endblock %} + +{% block content %} +{% block contentheader %} + + + + + + +
+ {% if cave.kataster_number %} + {{ cave.kataster_number|safe }} + {% if cave.entrancelist %} + - {{ cave.entrancelist|safe }} + {% endif %} + {% if cave.unofficial_number %} +
({{ cave.unofficial_number|safe }}) + {% endif %} + {% endif %} + 		+ {{ cave.official_name|safe }} + + {{ cave.kataster_code|safe }} +
{% block related %} -

All logbook entries regarding this cave ({{cave.logbookentry_set.count}})

- +{% endblock %}{% endblock %} + +
+ +
+

{% if cave.entrances %} +

Entrances

+ {% for ent in cave.entrances %} + {{ ent.entrance_letter|safe }} + {% if ent.entrance.marking %} + Marking: {{ ent.entrance.marking_val|safe }} + {% endif %} +
+ {% endfor %} +{% endif %}

+
+
+

{% if cave.explorers %} +

Explorers

+ {{ cave.explorers|safe }} +{% endif %} +{% if cave.underground_description %} +

Underground Description

+ {{ cave.underground_description|safe }} +{% endif %} +{% if cave.equipment %} +

Equipment

+ {{ cave.equipment|safe }} +{% endif %} +{% if cave.references %} +

References

+ {{ cave.references|safe }} +{% endif %} +{% if cave.survey %} +

Survey

+ {{ cave.survey|safe }} +{% endif %} +{% if cave.kataster_status %} +

Kataster_status

+ {{ cave.kataster_status|safe }} +{% endif %} +{% if cave.underground_centre_line %} +

Underground Centre Line

+ {{ cave.underground_centre_line|safe }} +{% endif %} +{% if cave.survex_file %} +

Survex File

+ {{ cave.survex_file|safe }} +{% endif %} +{% if cave.notes %} +

Notes

+ {{ cave.notes|safe }} +{% endif %}

+
+
+

+

{% for logbookentry in cave.logbookentry_set.all %} {% if logbookentry.title %} @@ -14,59 +96,10 @@ {% endif %} {% endfor %}
-{% endblock %} - -{% block content %} - -{% if cave.entrances %} -

Entrances

- {% for ent in cave.entrances %} - {{ ent.entrance_letter|wiki_to_html_short }} - {% if ent.entrance.marking %} - Marking: {{ ent.entrance.marking_val|wiki_to_html_short }} - {% endif %} -
- {% endfor %} -{% endif %} - -{% if cave.explorers %} -

Explorers

- {{ cave.explorers|wiki_to_html }} -{% endif %} -{% if cave.underground_description %} -

Underground Description

- {{ cave.underground_description|wiki_to_html }} -{% endif %} -{% if cave.equipment %} -

Equipment

- {{ cave.equipment|wiki_to_html }} -{% endif %} -{% if cave.references %} -

References

- {{ cave.references|wiki_to_html }} -{% endif %} -{% if cave.survey %} -

Survey

- {{ cave.survey|wiki_to_html }} -{% endif %} -{% if cave.kataster_status %} -

Kataster_status

- {{ cave.kataster_status|wiki_to_html }} -{% endif %} -{% if cave.underground_centre_line %} -

Underground Centre Line

- {{ cave.underground_centre_line|wiki_to_html }} -{% endif %} -{% if cave.survex_file %} -

Survex File

- {{ cave.survex_file|wiki_to_html }} -{% endif %} -{% if cave.notes %} -

Notes

- {{ cave.notes|wiki_to_html }} -{% endif %} - -{% if cave.get_QMs %} +

+ +
+

{% if cave.get_QMs %}

Question marks

Extant

-{% endif %} +{% endif %}

+
+ + + {% endblock %} diff --git a/templates/cavebase.html b/templates/cavebase.html index 8e8132e..6e27111 100644 --- a/templates/cavebase.html +++ b/templates/cavebase.html @@ -1,28 +1,26 @@ -{% extends "base.html" %} -{% load wiki_markup %} + + -{% block title %}{{ cave.official_name|wiki_to_html_short }}{% endblock %} - -{% block contentheader %} - - - - - - -
- {% if cave.kataster_number %} - {{ cave.kataster_number|wiki_to_html_short }} - {% if cave.entrancelist %} - - {{ cave.entrancelist|wiki_to_html_short }} - {% endif %} - {% if cave.unofficial_number %} -
({{ cave.unofficial_number|wiki_to_html_short }}) - {% endif %} - {% endif %} - 		- {{ cave.official_name|wiki_to_html_short }} - - {{ cave.kataster_code|wiki_to_html_short }} -
-{% endblock %} \ No newline at end of file + +{% block title %}{{ cave.official_name|safe }}{% endblock %} + + + + + + + + +{% block content %}{% endblock %} +{% block menu %} + +{% endblock %} + + diff --git a/templates/caveindex.html b/templates/caveindex.html index ae8b224..ac67559 100644 --- a/templates/caveindex.html +++ b/templates/caveindex.html @@ -1,23 +1,37 @@ -{% extends "base.html" %} +{% extends "cavebase.html" %} {% load wiki_markup %} {% block title %}Cave Index{% endblock %} {% block content %} +

Cave Index

+

Notable caves

-

All caves

+

1623

-{% endblock %} \ No newline at end of file +

1626

+ + + +{% endblock %} diff --git a/templates/editcave.html b/templates/editcave.html new file mode 100644 index 0000000..0e1785b --- /dev/null +++ b/templates/editcave.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% load csrffaker %} +{% block title %}Logbook {{logbookentry.id}}{% endblock %} +{% block head %} + + + + + +{{ tripForm.media }} +{% endblock %} +{% block content %} + +
{% csrf_token %} + {{ form }} +

+
+ +{% endblock %} diff --git a/templates/expowebbase.html b/templates/expowebbase.html new file mode 100644 index 0000000..128ce54 --- /dev/null +++ b/templates/expowebbase.html @@ -0,0 +1,40 @@ + + + + +{% block title %}{% endblock %} + + + + + + +{% block content %}{% endblock %} + + + diff --git a/templates/flatpage.html b/templates/flatpage.html index ef8c4ab..8c476b8 100644 --- a/templates/flatpage.html +++ b/templates/flatpage.html @@ -2,7 +2,7 @@ {{ head|safe }} - + {{ body|safe }} {% if editable %}Edit{% endif %}