diff --git a/parsers/QMs.py b/parsers/QMs.py index 6505ddd..8583ee6 100644 --- a/parsers/QMs.py +++ b/parsers/QMs.py @@ -4,7 +4,7 @@ import csv import settings from expo.models import QM, LogbookEntry, Cave from datetime import * -from helpers import save_carefully +from save_carefully import save_carefully import re def deleteQMs(): diff --git a/parsers/cavetab.py b/parsers/cavetab.py index 940d867..94b0e02 100644 --- a/parsers/cavetab.py +++ b/parsers/cavetab.py @@ -9,7 +9,7 @@ import time import re import os -from troggle.helpers import save_carefully +from save_carefully import save_carefully ##format of CAVETAB2.CSV is KatasterNumber = 0 diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 7c8364a..e1baadc 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -13,7 +13,7 @@ import re import datetime import os -from troggle.helpers import save_carefully +from save_carefully import save_carefully # # When we edit logbook entries, allow a "?" after any piece of data to say we've frigged it and diff --git a/parsers/people.py b/parsers/people.py index 23654d2..e762b66 100644 --- a/parsers/people.py +++ b/parsers/people.py @@ -7,7 +7,7 @@ import re import datetime import os import shutil -from helpers import save_carefully +from save_carefully import save_carefully # Julian: the below code was causing errors and it seems like a duplication of the above. Hope I haven't broken anything by commenting it. -Aaron # diff --git a/save_carefully.py b/save_carefully.py index 1631618..f72b4fa 100644 --- a/save_carefully.py +++ b/save_carefully.py @@ -1,5 +1,16 @@ -def save(objectType, lookupAttribs={}, nonLookupAttribs={}): +from settings import LOGFILE +def save_carefully(objectType, lookupAttribs={}, nonLookupAttribs={}): + """Looks up instance using lookupAttribs and carries out the following: + -if instance does not exist in DB: add instance to DB, return (new instance, True) + -if instance exists in DB and was modified using Troggle: do nothing, return (existing instance, False) + -if instance exists in DB and was not modified using Troggle: overwrite instance, return (instance, False) + + The checking is accomplished using Django's get_or_create and the new_since_parsing boolean field + defined in expo.models.TroggleModel. + + """ + instance, created=objectType.objects.get_or_create(defaults=nonLookupAttribs, **lookupAttribs) if not created and not instance.new_since_parsing: @@ -7,4 +18,14 @@ def save(objectType, lookupAttribs={}, nonLookupAttribs={}): setattr(instance, k, v) instance.save() - return instance \ No newline at end of file + if LOGFILE: + if created: + LOGFILE.write(unicode(instance)+u' was just added to the database for the first time. \n') + + if not created and instance.new_since_parsing: + LOGFILE.write(unicode(instance)+" has been modified using Troggle, so the current script left it as is. \n") + + if not created and not instance.new_since_parsing: + LOGFILE.write(unicode(instance)+" existed in the database unchanged since last parse. It was overwritten by the current script. \n") + LOGFILE.flush() + return (instance, created) \ No newline at end of file