diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-17 04:31:23 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-17 04:31:23 +0100 |
| commit | 21c39f70de1fa20ae20933a761773e9b15ea1a11 (patch) | |
| tree | 443504a7967e9d302fc4365193097c1a6cbf10eb /parsers | |
| parent | 7566faf77b488ce391917f5ae6aabb09842ed620 (diff) | |
| download | troggle-21c39f70de1fa20ae20933a761773e9b15ea1a11.tar.gz troggle-21c39f70de1fa20ae20933a761773e9b15ea1a11.tar.bz2 troggle-21c39f70de1fa20ae20933a761773e9b15ea1a11.zip | |
[svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.
- Fix problems in QM parsing script
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/QMs.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/parsers/QMs.py b/parsers/QMs.py index 3eddfa5..732e913 100644 --- a/parsers/QMs.py +++ b/parsers/QMs.py @@ -1,11 +1,11 @@ # -*- coding: UTF-8 -*- import csv -import settings +from django.conf import settings from expo.models import QM, LogbookEntry, Cave from datetime import * from troggle.save_carefully import save_carefully -import re +import re, os def deleteQMs(): QM.objects.all().delete() @@ -23,15 +23,14 @@ def parseCaveQMs(cave,inputFile): try: hauchHl=Cave.objects.get(official_name="Hauchhöhle") except Cave.DoesNotExist: - print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first." + print "Hauchhoele is not in the database. Please run parsers.cavetab first." return elif cave =='kh': try: kh=Cave.objects.get(official_name="Kaninchenhöhle") except Cave.DoesNotExist: - print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first." - for file in inputFile: - parse_KH_QMs(kh, inputFile=file) + print "KH is not in the database. Please run parsers.cavetab first." + parse_KH_QMs(kh, inputFile=inputFile) return qmPath = settings.EXPOWEB+inputFile @@ -108,13 +107,10 @@ def parse_KH_QMs(kh, inputFile): 'nearest_station':res['nearest_station'], 'location_description':res['description'] } - - if - + save_carefully(QM,lookupArgs,nonLookupArgs) -parseCaveQMs(cave='kh', inputFile=r"smkridge/161/qmtodo.htm") parseCaveQMs(cave='stein',inputFile=r"smkridge/204/qm.csv") parseCaveQMs(cave='hauch',inputFile=r"smkridge/234/qm.csv") - +parseCaveQMs(cave='kh', inputFile="smkridge/161/qmtodo.htm")
\ No newline at end of file |