Add reason for juvenes if not open

food.py

@@ -172,7 +172,8 @@ def write_day(day, header, outfname, last_day, restaurants, prefix, resources_pr
         css_class = "left"
         fout.write("<div class=\"foods\"><div class=\"{css_class}\">\n".format(css_class=css_class))
         for r in restaurants:
-            title, open_hours, week, week_foods, info = r
+            title, open_hours, week, week_foods, info = r[:5]
+            exception = r[5].replace("\n", "<br>") if len(r) > 5 and r[5] else "Ruokalistaa ei saatavilla."
             title2, url, lazy_allergies, info_class = info[0:4]
             if day in week_foods or day < 5:
                 if info_class != css_class:
@@ -181,7 +182,7 @@ def write_day(day, header, outfname, last_day, restaurants, prefix, resources_pr
                 url = url.replace("&", "&amp;")
                 fout.write("<h2><a href=\"{url}\">{title}</a></h2>\n".format(url=url, title=title))
                 if not day in week_foods:
-                    fout.write("<p class=\"missing\">Ruokalistaa ei saatavilla.</p>")
+                    fout.write("<p class=\"missing\">{exception}</p>".format(exception=exception))
                     continue
                 if week != "" and week != max_week:
                     if week > max_week or (week == 1 and max_week == 52):
@@ -336,7 +337,7 @@ def write_table(restaurants, prefix, title, resources_prefix):
         write_prefix_header(fout, prefix, 0, resources_prefix)
         fout.write("</div><table border=\"1\"><tr><th>Päivä</th>")
         for r in restaurants:
-            (title, open_hours, week, week_foods, info) = r
+            (title, open_hours, week, week_foods, info) = r[:5]
             (title2, url) = info[0:2]
             url = re.sub("&", "&nbsp;", url)
             fout.write("<th><a href=\"{url}\">{title}</a></th>".format(url=url, title=title))
@@ -344,7 +345,7 @@ def write_table(restaurants, prefix, title, resources_prefix):
         for day in range(last_day):
             fout.write("<tr><td>{day_name}</td>\n".format(day_name=day_names[day]))
             for r in restaurants:
-                (title, open_hours, week, week_foods, info) = r
+                (title, open_hours, week, week_foods, info) = r[:5]
                 if day in week_foods and (week == "" or week == max_week):
                     fout.write("<td><ul>\n")
                     for food in week_foods[day]:

juvenes.py

@@ -4,21 +4,21 @@ import datetime
 import re
 import json
 
-# last two in order are $kitchen_info_id, $menu_type_id
+# Last three columns are Kitchen Info ID, Menu Type ID and Concept ID. There may be multiple concepts in a single restauranta.
+# Juvenes API defines also Restaurant ID but that is not used.
 restaurant_info = [
-  [ "(TaY) Yliopiston Ravintola", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola.aspx", "M", "left", 13, 60 ],
-  [ "(TaY) Yliopiston Ravintola / VegeBar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola.aspx", "", "left", 13, 5 ],
-  [ "(TaY) Café Campus", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9campus.aspx", "", "left", 130019, 23 ],
-  [ "(TaY) Café Pinni", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9lunchpinni.aspx", "M", "middle", 130016, 60 ],
-  [ "(TAYS) Arvo", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/arvo.aspx", "M", "left", 5, 60 ],
-  [ "(TAYS) Café Lea (Fusion Kitchen)", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/cafélea.aspx", "M", "left", 50026, 3 ],
-  [ "(TAYS) Café Lea (My Salad)", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/cafélea.aspx", "M", "left", 50026, 76 ],
-  [ "(TTY) Newton", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton.aspx", "", "left", 6, 60],
-  [ "(TTY) Café Konehuone / Såås bar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone.aspx", "", "left", 60038, 77],
-  [ "(TTY) Café Konehuone / Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone.aspx", "", "middle", 60038, 3 ],
-  [ "(TAMK) Ziberia", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/ziberia.aspx", "", "middle", 11, 60 ],
-#  [ "(TAMK) Frenckell", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/frenckell.aspx", "", "middle", 33, 60 ],
-  [ "(TAMK) Frenckell / Såås bar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/frenckell.aspx", "", "middle", 33, 77 ]
+  [ "(TaY) Yliopiston Ravintola", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola.aspx", "M", "left", 13, 60, []],
+  [ "(TaY) Yliopiston Ravintola / VegeBar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola.aspx", "", "left", 13, 5, []],
+  [ "(TaY) Café Campus", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9campus.aspx", "", "left", 130019, 23, []],
+  [ "(TaY) Café Pinni", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9lunchpinni.aspx", "M", "middle", 130016, 60, []],
+  [ "(TAYS) Arvo", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/arvo.aspx", "M", "left", 5, 60, []],
+  [ "(TAYS) Café Lea (Fusion Kitchen)", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/cafélea.aspx", "M", "left", 50026, 3, []],
+  [ "(TAYS) Café Lea (My Salad)", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/cafélea.aspx", "M", "left", 50026, 76, []],
+  [ "(TTY) Newton", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton.aspx", "", "left", 6, 60, [1149]],
+  [ "(TTY) Café Konehuone / Såås bar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone.aspx", "", "left", 60038, 77, [3663]],
+  [ "(TTY) Café Konehuone / Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone.aspx", "", "middle", 60038, 3, [1674]],
+  [ "(TAMK) Ziberia", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/ziberia.aspx", "", "middle", 11, 60, []],
+  [ "(TAMK) Frenckell / Såås bar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/frenckell.aspx", "", "middle", 33, 77, []]
 ]
 
 
@@ -27,15 +27,25 @@ def get_restaurants(use_old, week):
     for count, info in enumerate(restaurant_info):
         kitchen = info[4]
         menutype = info[5]
+        concepts = info[6]
         title = info[0]
         cur_title = title
         open_hours = ""
+        exception = None
         week_foods = {}
         for weekday in range(1,7):
             url = "http://www.juvenes.fi/DesktopModules/Talents.LunchMenu/LunchMenuServices.asmx/GetMenuByWeekday?KitchenId={kitchen}&MenuTypeId={menutype}&Week={week}&Weekday={weekday}&lang='fi'&format=json".format(kitchen=kitchen, menutype=menutype, week=week, weekday=weekday)
             temp_fname = "juvenes_{count}-{weekday}.temp.js".format(count=count, weekday=weekday)
             data = pnalib.get_jsonp_file(url, temp_fname, use_old, allow_old=False)
-            if data and data["d"] != "null":
+            if not data:
+                # Try to find problem
+                for concept in concepts:
+                    url = "http://www.juvenes.fi/DesktopModules/Talents.Restaurants/RestaurantsService.svc/GetConcept?menuId={concept}&lang=fi".format(concept=concept)
+                    temp_fname = "juvenes_{count}-{weekday}-{concept}.temp.js".format(count=count, weekday=weekday, concept=concept)
+                    data = pnalib.get_json_file(url, temp_fname, use_old, allow_old=False)
+                    if data and data["d"]:
+                        exception = data["d"]["OpenInfo"]["Exeption1InfoText"]
+            elif data and data["d"] != "null":
                 data = json.loads(data["d"])
                 cur_day_foods = []
                 mealoptions = data["MealOptions"]
@@ -55,5 +65,5 @@ def get_restaurants(use_old, week):
                     if cur_food != ["-"]:
                         cur_day_foods.append("\n".join(cur_food))
                 week_foods[weekday-1] = cur_day_foods
-        restaurants.append([title, open_hours, week, week_foods, info])
+        restaurants.append([title, open_hours, week, week_foods, info, exception])
     return restaurants