projects
/
angular-mojolicious.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default number of slots
[angular-mojolicious.git]
/
angular-server.pl
diff --git
a/angular-server.pl
b/angular-server.pl
index
7cf3436
..
09ca4b3
100755
(executable)
--- a/
angular-server.pl
+++ b/
angular-server.pl
@@
-228,6
+228,10
@@
get '/json/:database/:entity' => sub {
use Encode;
use iCal::Parser;
use Encode;
use iCal::Parser;
+plugin 'proxy';
+
+my $slot_regex = '(\d+)\s*mjesta';
+
get '/reservations/get/(*url)' => sub {
my $self = shift;
get '/reservations/get/(*url)' => sub {
my $self = shift;
@@
-259,13
+263,16
@@
get '/reservations/get/(*url)' => sub {
@events = map {
foreach my $check_slot ( qw(
@events = map {
foreach my $check_slot ( qw(
+ DESCRIPTION
LOCATION
STATUS
SUMMARY
)) {
next unless exists $_->{$check_slot};
LOCATION
STATUS
SUMMARY
)) {
next unless exists $_->{$check_slot};
- $_->{slots} = $1 if $_->{$check_slot} =~ m/
(\d+)\s*mjesta/
s;
+ $_->{slots} = $1 if $_->{$check_slot} =~ m/
$slot_regex/i
s;
}
}
+ $_->{slots} ||= $1 if $ical->{cal}->{'X-WR-CALDESC'} =~ m/$slot_regex/s;
+ $_->{slots} ||= 15; # XXX default number of slots
$_;
} @events;
$_;
} @events;
@@
-288,11
+295,11
@@
get '/reservations/events/:view_name' => sub {
language => 'javascript',
views => {
submited => {
language => 'javascript',
views => {
submited => {
- map => q|
+ map => q|
(
function(doc) {
if ( doc.event && doc.event.UID ) emit(doc.event.UID, 1)
}
function(doc) {
if ( doc.event && doc.event.UID ) emit(doc.event.UID, 1)
}
- |,
+
)
|,
reduce => q|_sum|,
}
}
reduce => q|_sum|,
}
}
@@
-305,9
+312,13
@@
get '/reservations/events/:view_name' => sub {
$hash->{ $row->{key} } = $row->{value};
}
$hash->{ $row->{key} } = $row->{value};
}
+ $hash ||= {};
+
_render_jsonp( $self, $hash );
};
_render_jsonp( $self, $hash );
};
+get '/_utils/script/(*url)' => sub { $_[0]->proxy_to( "$couchdb/_utils/script/" . $_[0]->param('url') , with_query_params => 1 ) };
+
app->start;
__DATA__
app->start;
__DATA__