X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=angular-server.pl;h=d2edf1d0ee8e5cdc0cf602f571948e8768b661bf;hb=5d3c80ba58a5df6bfee0a6014d9d89e0f5b44ed7;hp=71e5f69cb60159b109a2e608b4d16aa516b95261;hpb=1b61608dd2d2fc90aef81350a00a48459c5413ec;p=angular-mojolicious.git

diff --git a/angular-server.pl b/angular-server.pl
index 71e5f69..d2edf1d 100755
--- a/angular-server.pl
+++ b/angular-server.pl
@@ -136,7 +136,7 @@ any [ 'post' ] => '/data/:database/:entity' => sub {
 		$json->{'_'.$_} = $new->{$_} foreach ( 'rev','id' );
 	} else {
 		warn "ERROR: ",dump($new);
-		$json->{_error} = $new;
+		$json->{error} = $new;
 	}
 
 	_render_jsonp( $self,  $json );
@@ -228,6 +228,8 @@ get '/json/:database/:entity' => sub {
 use Encode;
 use iCal::Parser;
 
+plugin 'proxy';
+
 get '/reservations/get/(*url)' => sub {
 	my $self = shift;
 
@@ -257,6 +259,19 @@ get '/reservations/get/(*url)' => sub {
 		}
 	}
 
+	@events = map {
+		foreach my $check_slot ( qw(
+			DESCRIPTION
+			LOCATION
+			STATUS
+			SUMMARY
+		)) {
+			next unless exists $_->{$check_slot};
+			$_->{slots} = $1 if $_->{$check_slot} =~ m/(\d+)\s*mjesta/s;
+		}
+		$_;
+	} @events;
+
 	$ical->{events} = [ sort {
 					$a->{DTSTART} cmp $b->{DTSTART}
 	} @events ];
@@ -293,9 +308,13 @@ get '/reservations/events/:view_name' => sub {
 		$hash->{ $row->{key} } = $row->{value};
 	}
 
+	$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__