From 09581829d141cb29f1b87473c2266562ae6f7679 Mon Sep 17 00:00:00 2001 From: martin speleo Date: Sat, 4 Jul 2009 17:08:48 +0100 Subject: [PATCH] [svn] Changed addToArgsSurveyStation such that it does not pass a surveystation model to html_to_wiki. Which was unecessary as html_to_wiki returned it without modification. By removing it html_to_wiki can be cleaned up. --- parsers/cavetab.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parsers/cavetab.py b/parsers/cavetab.py index 20c7658..0fbde43 100644 --- a/parsers/cavetab.py +++ b/parsers/cavetab.py @@ -141,7 +141,7 @@ def LoadCaveTab(): if created and line[UnofficialName]: newUnofficialName = models.OtherCaveName(cave = newCave, name = line[UnofficialName]) newUnofficialName.save() - + logging.info("Added unofficial name "+str(newUnofficialName)+" to cave "+str(newCave)+"\n") if created and line[MultipleEntrances] == '' or \ @@ -189,7 +189,7 @@ def LoadCaveTab(): if line[CSVname]: surveyPoint = models.SurveyStation(name = line[CSVname]) surveyPoint.save() - args[modelName] = html_to_wiki(surveyPoint) + args[modelName] = surveyPoint addToArgsSurveyStation(TagPoint, 'tag_station') addToArgsSurveyStation(ExactEntrance, 'exact_station') addToArgsSurveyStation(OtherPoint, 'other_station') @@ -203,8 +203,8 @@ def LoadCaveTab(): addToArgs(Bearings, 'bearings') newEntrance = models.Entrance(**args) newEntrance.save() - - logging.info("Added entrance "+str(newEntrance)+"\n") + + logging.info("Added entrance "+str(newEntrance)+"\n") if line[Entrances]: entrance_letter = line[Entrances]