X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=angular-server.pl;h=1f253a3f2dbbe18a4ba641e4aa6b14d5ca45ec13;hb=097081fe8c7e0a5227f92188d331586c0ebf6b31;hp=221f60d2a7f9742a08215aa919a1e40e90ec91af;hpb=d10d1e04bf1ea8e22b54e7ba985b66ab6c3f125c;p=angular-mojolicious.git

diff --git a/angular-server.pl b/angular-server.pl
index 221f60d..1f253a3 100755
--- 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;
+			die "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 {
@@ -64,7 +72,6 @@ get '/_replicate' => sub {
 	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};
@@ -74,11 +81,15 @@ get '/_replicate' => sub {
 				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 );
+				my $all = $self->client->get( $url )->res->json;
+				warn "# replicated $url ", dump($all);
+				foreach my $e ( @$all ) {
+					delete $e->{_id}; # sanitize data from older implementation
+					_couchdb_put( "/$database/$entity." . $e->{'$id'} => $e );
+				}
 			}
 		}
+		_render_jsonp( $self,  $got );
 	}
 };
 
@@ -157,7 +168,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 );
 };