croatian version

[angular-mojolicious.git] / angular-server.pl

diff --git a/angular-server.pl b/angular-server.pl
index 221f60d..414c172 100755 (executable)
--- a/angular-server.pl
+++ b/angular-server.pl
@@ -23,15 +23,23 @@ sub _couchdb_put {
 
        my $json = Mojo::JSON->new->encode( $data );
 
+       my $rev;
+
        warn "# _couchdb_put $url = $json";
        $client->put( "$couchdb/$url" => $json => sub {
                my ($client,$tx) = @_;
+               my ($message, $code) = $tx->error;
+               my $response = $tx->res->json;
+               warn "## response $code ",dump($response);
                if ($tx->error) {
-                       die "ERROR CouchDB ",$tx->error;
+                       warn "ERROR $code $message";
                }
-               my $response = $tx->res->json;
-               warn "## CouchDB response ",dump($response);
+               return
+               $rev = $response->{rev};
        })->process;
+
+       warn "## rev = $rev";
+       return $rev;
 }
 
 sub _couchdb_get {
@@ -58,29 +66,6 @@ warn "## _render_json $data";
 
 #get '/' => 'index';
 
-get '/_replicate' => sub {
-       my $self = shift;
-
-       if ( my $from = $self->param('from') ) {
-               my $got = $self->client->get( $from )->res->json;
-               warn "# from $from ",dump($got);
-               _render_jsonp( $self,  $got );
-
-               my $database = $got->{name};
-               my $entities = $got->{entities};
-
-               if ( $database && $entities ) {
-                       foreach my $entity ( keys %$entities ) {
-                               my $url = $from;
-                               $url =~ s{/?$}{/}; # add slash at end
-                               $url .= $entity;
-                               my $e = $self->client->get( $url )->res->json;
-                               warn "# replicated $url ", dump($e);
-                               _chouchdb_put( $self, $database, $entity, $e->{'$id'}, $e );
-                       }
-               }
-       }
-};
 
 get '/data/' => sub {
        my $self = shift;
@@ -101,7 +86,7 @@ get '/data/:database' => sub {
                        language => 'javascript',
                        views => {
                                counts => {
-                                       map    => q| function(doc) { emit(doc.$entity,1); } |,
+                                       map    => q| function(doc) { emit(doc._id.split('.')[0],1); } |,
                                        reduce => q| function(keys,values,rereduce) { return sum(values); } |,
                                }
                        }
@@ -157,7 +142,8 @@ any [ 'post' ] => '/data/:database/:entity' => sub {
 
        $json->{'$id'} ||= $id; # make sure $id is in there
 
-       _couchdb_put "/$database/$entity.$id" => $json;
+       my $rev = _couchdb_put "/$database/$entity.$id" => $json;
+       $json->{_rev} = $rev;
 
        _render_jsonp( $self,  $json );
 };