Fixes to restaurant status

food.pl

@@ -188,8 +188,6 @@ sub write_day {
     my ($title2, $url, $lazy_allergies, $info_class) = @{$info_ref};
     my @week_foods = @{$week_foods_ref};
     if (defined($week_foods[$day]) || $day < 5) {
-      # Bio+Kliininen often have the same foods
-      next if (try_merge_bio_kliininen(\$title, $day));
 
       if ($info_class ne $class) {
 	$class = $info_class;

juvenes.pl

@@ -1,22 +1,15 @@
 use vars qw(@day_names);
 use JSON;
 
-my $pinni_title = "(TaY) Café Pinni";
-my $bio_title = "(TAYS) Bio";
-my $kliininen_title = "(TAYS) Arvo";
-my $kliininen_fusion_title = "(TAYS) Arvo Fusion Kitchen";
-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 / VegeBar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola/vegebar.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 ],
+  [ "(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 ],
-  [ $pinni_title, "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9lunchpinni.aspx", "M", "middle", 130016, 60 ],
-  [ $bio_title, "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/medicabio.aspx", "M", "left", 5, 60 ],
-  [ $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 ],
+  [ "(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/s%C3%A5%C3%A5sbar.aspx", "", "left", 60038, 77],
   [ "(TTY) Café Konehuone / Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone/fusionkitchen.aspx", "", "middle", 60038, 3 ],
@@ -43,41 +36,6 @@ sub finish_day {
   $day_id = $day_id + 1;
 }
 
-sub can_merge_bio_kliininen {
-  my $day = shift;
-
-  my $bio_foods = "";
-  my $kliininen_foods = "";
-  my $food_dest;
-  foreach my $r (@restaurants) {
-    my ($title, $open_hours, $week, $week_foods_ref) = @{$r};
-    if ($title eq $bio_title) {
-      $food_dest = \$bio_foods;
-    } elsif ($title eq $kliininen_title) {
-      $food_dest = \$kliininen_foods;
-    } else {
-      next;
-    }
-    my @week_foods = @{$week_foods_ref};
-    foreach my $food (@{$week_foods[$day]}) {
-      ${$food_dest} .= "$food\n";
-    }
-  }
-  return $bio_foods eq $kliininen_foods;
-}
-
-sub try_merge_bio_kliininen {
-  my ($title_ref, $day) = @_;
-  my $title = $$title_ref;
-
-  if ($title eq $bio_title && can_merge_bio_kliininen($day)) {
-    $$title_ref .= " + Kliininen";
-  } elsif ($title eq $kliininen_title && can_merge_bio_kliininen($day)) {
-    return 1;
-  }
-  return 0;
-}
-
 sub get_juvenes_restaurants {
   my $use_old = shift;
   my $count = 0;

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/lounaslistat";
+my $pky_url = "http://www.pikante.fi/lounaslistat-pdf";
 
 my @restaurant_info = (
   [ "(TAYS) Finn-Medi", "$pky_url", "all", "middle" ],