Browse Source

Modify restaurant lists

Toni Fadjukoff 8 years ago
parent
commit
b78b9849b0
5 changed files with 9 additions and 7 deletions
  1. 2 0
      .gitignore
  2. 1 1
      food.pl
  3. 4 2
      juvenes.pl
  4. 1 1
      pky.pl
  5. 1 3
      sodexo.pl

+ 2 - 0
.gitignore View File

@@ -6,4 +6,6 @@
6 6
 4.html
7 7
 5.html
8 8
 6.html
9
+7.html
9 10
 table.html
11
+*.tmp

+ 1 - 1
food.pl View File

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

+ 4 - 2
juvenes.pl View File

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

+ 1 - 1
pky.pl View File

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

+ 1 - 3
sodexo.pl View File

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