diff options
Diffstat (limited to 'core/models/caves.py')
| -rw-r--r-- | core/models/caves.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index edaae9a..ddb0255 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -182,16 +182,17 @@ class Cave(TroggleModel): def writeDataFile(self): try: - f = open(os.path.join(settings.CAVEDESCRIPTIONS, self.filename), "wb") + f = open(os.path.join(settings.CAVEDESCRIPTIONS, self.filename), "w") except: subprocess.call(settings.FIX_PERMISSIONS) - f = open(os.path.join(settings.CAVEDESCRIPTIONS, self.filename), "wb") + f = open(os.path.join(settings.CAVEDESCRIPTIONS, self.filename), "w") t = loader.get_template('dataformat/cave.xml') #c = Context({'cave': self}) c = dict({'cave': self}) - u = t.render(c) - u8 = u.encode("utf-8") - f.write(u8) + u = t.render(c) + # u8 = u.encode("utf-8") + # f.write(u8) + f.write(u) f.close() def getArea(self): @@ -350,10 +351,11 @@ class Entrance(TroggleModel): subprocess.call(settings.FIX_PERMISSIONS) f = open(os.path.join(settings.ENTRANCEDESCRIPTIONS, self.filename), "w") t = loader.get_template('dataformat/entrance.xml') - c = Context({'entrance': self}) + c = dict({'entrance': self}) u = t.render(c) - u8 = u.encode("utf-8") - f.write(u8) + # u8 = u.encode("utf-8") + # f.write(u8) + f.write(u) f.close() class LogbookEntry(TroggleModel): @@ -641,10 +643,10 @@ def GetCaveLookup(): Gcavelookup["2015-mf-06"] = Gcavelookup["288"] Gcavelookup["2016-jb-01"] = Gcavelookup["289"] Gcavelookup["2017-pw-01"] = Gcavelookup["277"] - Gcavelookup["2018-dm-07"] = Gcavelookup["359"] - Gcavelookup["2017_cucc_24"] = Gcavelookup["291"] # note _ not - here - Gcavelookup["2017_cucc_23"] = Gcavelookup["295"] - Gcavelookup["2017_cucc_28"] = Gcavelookup["290"] + Gcavelookup["2018-dm-07"] = Gcavelookup["359"] # NB this is 1626 + Gcavelookup["2017_cucc_24"] = Gcavelookup["291"] # note _ not - + Gcavelookup["2017_cucc_23"] = Gcavelookup["295"] # note _ not - + Gcavelookup["2017_cucc_28"] = Gcavelookup["290"] # note _ not - Gcavelookup["bs17"] = Gcavelookup["283"] Gcavelookup["1976/b11"] = Gcavelookup["198"] @@ -679,12 +681,14 @@ def GetCaveLookup(): Gcavelookup["gsh"] = Gcavelookup["291"] Gcavelookup["homecoming"] = Gcavelookup["2018-dm-07"] + Gcavelookup["heimkommen"] = Gcavelookup["2018-dm-07"] Gcavelookup["99ob02"] = Gcavelookup["1999-ob-02"] addmore = {} for id in Gcavelookup: addmore[id.replace("-","_")] = Gcavelookup[id] addmore[id.replace("_","-")] = Gcavelookup[id] + addmore[id.upper()] = Gcavelookup[id] Gcavelookup = {**addmore, **Gcavelookup} addmore ={} |