Modify restaurant lists

.gitignore

@@ -6,4 +6,6 @@
 4.html
 5.html
 6.html
+7.html
 table.html
+*.tmp

food.pl

@@ -36,8 +36,8 @@ my @unordered;
 my @l = localtime;
 my $this_week = strftime("%V", @l);
 
-push @unordered, get_juvenes_restaurants($use_old);
 push @unordered, get_amica_restaurant($use_old);
+push @unordered, get_juvenes_restaurants($use_old);
 push @unordered, get_sodexo_restaurants($use_old);
 push @unordered, get_pky_restaurants($use_old, $l[6] == 0 || $l[6] == 6);
 

juvenes.pl

@@ -9,6 +9,7 @@ my $zip_salaattibaari_title = "(TTY) Zip Salaattibaari";
 # last two in order are $kitchen_info_id, $menu_type_id
 my @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 / Rohee Xtra", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola/roheextra.aspx", "M", "left", 13, 74 ],
   [ "(TaY) Yliopiston Ravintola / Salaattibaari", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola/salaattibaari.aspx", "", "left", 13, 5 ],
   [ "(TaY) Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola/fusionkitchen.aspx", "", "left", 13, 3 ],
   [ $pinni_title, "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9lunchpinni.aspx", "M", "middle", 130016, 60 ],
@@ -16,9 +17,10 @@ my @restaurant_info = (
   [ $kliininen_title, "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/medicaarvo.aspx", "M", "left", 50026, 60 ],
   [ $kliininen_fusion_title, "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/medicaarvo/fusionkitchen.aspx", "M", "left", 50026, 3 ],
   [ "(TTY) Newton", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton.aspx", "", "left", 6, 60],
+  [ "(TTY) Newton / Rohee Xtra", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton/roheextra.aspx", "", "left", 6, 74],
   [ "(TTY) Zip", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/zip.aspx", "", "right", 12, 60 ],
-  [ "(TTY) Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton/fusionkitchen.aspx", "", "left", 6, 3 ],
-  [ "(TAMK) Dot", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tamkdot.aspx", "", "middle", 110027, 60 ]
+  #[ "(TTY) Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton/fusionkitchen.aspx", "", "left", 6, 3 ],
+  [ "(TAMK) Ziberia", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/ziberia.aspx", "", "middle", 11, 60 ]
 );
 
 my @restaurants;

pky.pl

@@ -3,7 +3,7 @@ use vars qw(@day_names);
 my @short_day_names = ( "ma", "ti", "ke", "to", "pe", "la", "su" );
 
 #my $pky_url = "http://www.pky.fi/lounaslistat";
-my $pky_url = "http://www.pikante.fi/index.php/Pikante/lounaaksi-t%C3%A4n%C3%A4%C3%A4n.html";
+my $pky_url = "http://www.pikante.fi/lounaslistat";
 
 my @restaurant_info = (
   [ "(TAYS) Finn-Medi", "$pky_url", "all", "middle" ],

sodexo.pl

@@ -3,10 +3,8 @@ use POSIX qw(strftime);
 
 
 my @restaurant_info = (
-  #[ "(TaY) Sodexo Linna", "http://www.sodexo.fi/fi-FI/linna/lounas/", "right" ],
-  #[ "(TTY) Sodexo Erkkeri", "http://www.sodexo.fi/fi-FI/erkkeri/lounas/", "left" ]
   [ "(TaY) Sodexo Linna", "http://www.sodexo.fi/linna", "", "right", 92],
-  [ "(TTY) Sodexo Erkkeri", "http://www.sodexo.fi/erkkeri", "", "left", 100]
+  #[ "(TTY) Sodexo Erkkeri", "http://www.sodexo.fi/erkkeri", "", "left", 100]
 );
 
 my ($cur_text, $cur_title, $parse_func, $day_id, $week);