summaryrefslogtreecommitdiffstats
path: root/parsers/QMs.py
diff options
context:
space:
mode:
Diffstat (limited to 'parsers/QMs.py')
-rw-r--r--parsers/QMs.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/parsers/QMs.py b/parsers/QMs.py
index 89a2640..a95a3cd 100644
--- a/parsers/QMs.py
+++ b/parsers/QMs.py
@@ -48,7 +48,9 @@ def parseCaveQMs(cave,inputFile):
parse_KH_QMs(kh, inputFile=inputFile)
return
- qmPath = settings.EXPOWEB+inputFile
+ #qmPath = settings.EXPOWEB+inputFile
+ qmPath = os.path.join(settings.EXPOWEB, inputFile)
+
qmCSVContents = open(qmPath,'rU')
dialect=csv.Sniffer().sniff(qmCSVContents.read())
qmCSVContents.seek(0,0)
@@ -105,7 +107,7 @@ def parseCaveQMs(cave,inputFile):
def parse_KH_QMs(kh, inputFile):
"""import QMs from the 1623-161 (Kaninchenh�hle) html pages
"""
- khQMs=open(settings.EXPOWEB+inputFile,'r')
+ khQMs=open(os.path.join(settings.EXPOWEB, inputFile),'r')
khQMs=khQMs.readlines()
for line in khQMs:
res=re.search('name=\"[CB](?P<year>\d*)-(?P<cave>\d*)-(?P<number>\d*).*</a> (?P<grade>[ABDCV])<dd>(?P<description>.*)\[(?P<nearest_station>.*)\]',line)