diff options
| -rw-r--r-- | databaseReset.py | 4 | ||||
| -rw-r--r-- | parsers/cavetab.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/databaseReset.py b/databaseReset.py index 3ef98c3..8000445 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -8,7 +8,7 @@ from django.db import connection from django.contrib.auth.models import User
from django.http import HttpResponse
-logfile=settings.LOGFILE
+
def reload_db():
cursor = connection.cursor()
@@ -37,7 +37,7 @@ def import_people(): parsers.people.LoadPersonsExpos()
def import_logbooks():
- logfile.write('\nBegun importing logbooks at ' + time.asctime() +'\n'+'-'*60)
+ settings.LOGFILE.write('\nBegun importing logbooks at ' + time.asctime() +'\n'+'-'*60)
import parsers.logbooks
parsers.logbooks.LoadLogbooks()
diff --git a/parsers/cavetab.py b/parsers/cavetab.py index 89e7728..187c4ac 100644 --- a/parsers/cavetab.py +++ b/parsers/cavetab.py @@ -136,7 +136,7 @@ def html_to_wiki(text): text2 = ""
return out
-def LoadCaveTab(logfile=None):
+def LoadCaveTab(logfile=settings.LOGFILE):
cavetab = open(os.path.join(settings.EXPOWEB, "noinfo", "CAVETAB2.CSV"),'rU')
caveReader = csv.reader(cavetab)
caveReader.next() # Strip out column headers
|