Skip to content
Snippets Groups Projects
Commit 4116cf34 authored by Rico van Endern's avatar Rico van Endern
Browse files

Merged in dev (pull request #14)

speedy hotfix
parents c73a1799 1aa537d6
No related branches found
No related tags found
No related merge requests found
...@@ -12,24 +12,24 @@ def parseDay( dom, dayName ): ...@@ -12,24 +12,24 @@ def parseDay( dom, dayName ):
for tr in range(day.length()): for tr in range(day.length()):
tds = day[tr].find("td"); tds = day[tr].find("td");
gericht = tds[0].text() gericht = tds[0].text()
if gericht != "Pommes": #-zusatzstoffe
#-zusatzstoffe gericht = re.sub(r'\([\d+,]+\)', '', gericht)
gericht = re.sub(r'\([\d+,]+\)', '', gericht) #+verkuerzung
#+verkuerzung gericht = re.sub(r' dazu \d Beilagen nach Wahl', '', gericht)
gericht = re.sub(r' dazu \d Beilagen nach Wahl', '', gericht) gericht = re.sub(r',\sdazu\s', ' + ', gericht)
gericht = re.sub(r',\sdazu\s', ' + ', gericht) gericht = re.sub(r'\sund\s', ' & ', gericht)
gericht = re.sub(r'\sund\s', ' & ', gericht) #eyecandy
#eyecandy gericht = re.sub(r'\s,', ',', gericht)
gericht = re.sub(r'\s,', ',', gericht) gericht = re.sub(r',\S', ', ', gericht)
gericht = re.sub(r',\S', ', ', gericht) gericht = re.sub(r'\s$', '', gericht)
gericht = re.sub(r'\s$', '', gericht) gericht = re.sub(r',$', '', gericht)
gericht = re.sub(r',$', '', gericht) art = tds[1].text()
art = tds[1].text() art = re.sub(r',A', '', art)
art = re.sub(r',A', '', art) art = re.sub(r',K', '', art)
art = re.sub(r',K', '', art) kategorie = "icon-aktionsteller.png"
kategorie = tds[2].find("img").first().attr( "src" ) #kategorie = tds[2].find("img").first().attr( "src" )
kategorie = re.sub(r'fileadmin/images/speiseplaene/menuekategorie/', '', kategorie) #kategorie = re.sub(r'fileadmin/images/speiseplaene/menuekategorie/', '', kategorie)
gerichte.append({'gericht': gericht,"art": art,"kategorie":kategorie}) gerichte.append({'gericht': gericht,"art": art,"kategorie":kategorie})
jday = {'date': date,"gerichte":gerichte} jday = {'date': date,"gerichte":gerichte}
return jday return jday
...@@ -45,4 +45,4 @@ with io.open('mensaPlan.json', 'w', encoding='utf-8') as f: ...@@ -45,4 +45,4 @@ with io.open('mensaPlan.json', 'w', encoding='utf-8') as f:
f.write(unicode(json.dumps(result))) f.write(unicode(json.dumps(result)))
#multimensa #multimensa
#style #style
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment