From: Dobrica Pavlinusic Date: Mon, 17 Oct 2011 20:36:53 +0000 (+0200) Subject: Merge branch 'master' of github.com:dpavlin/angular-mojolicious X-Git-Url: http://git.rot13.org/?p=angular-mojolicious.git;a=commitdiff_plain;h=f0916f71c647f243a6e257aa71d5f37903ea2cd1;hp=5d3c80ba58a5df6bfee0a6014d9d89e0f5b44ed7 Merge branch 'master' of github.com:dpavlin/angular-mojolicious --- diff --git a/angular-server.pl b/angular-server.pl index d2edf1d..3dad3c4 100755 --- a/angular-server.pl +++ b/angular-server.pl @@ -230,6 +230,8 @@ use iCal::Parser; plugin 'proxy'; +my $slot_regex = '(\d+)\s*mjesta'; + get '/reservations/get/(*url)' => sub { my $self = shift; @@ -267,8 +269,9 @@ get '/reservations/get/(*url)' => sub { SUMMARY )) { next unless exists $_->{$check_slot}; - $_->{slots} = $1 if $_->{$check_slot} =~ m/(\d+)\s*mjesta/s; + $_->{slots} = $1 if $_->{$check_slot} =~ m/$slot_regex/is; } + $_->{slots} ||= $1 if $ical->{cal}->{'X-WR-CALDESC'} =~ m/$slot_regex/s; $_; } @events;