From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 14 Oct 2011 20:05:42 +0000 (+0200)
Subject: correctly handle multiple add_fun calls
X-Git-Url: http://git.rot13.org/?p=angular-mojolicious.git;a=commitdiff_plain;h=1851c5ee0bdf86ca4285a60e3cc7458485e1a6a2

correctly handle multiple add_fun calls
---

diff --git a/couchdb-view-server.pl b/couchdb-view-server.pl
index c210a0a..cc64570 100755
--- a/couchdb-view-server.pl
+++ b/couchdb-view-server.pl
@@ -23,26 +23,30 @@ my $in  = IO::Handle->new_from_fd(\*STDIN, 'r');
 my $out = IO::Handle->new_from_fd(\*STDOUT, 'w');
 $out->autoflush(1);
 
-open(my $l_fh, '>', "/tmp/couchdb-perl-view.log");
+open(my $l_fh, '>>', "/tmp/couchdb-perl-view.log");
+$l_fh->autoflush(1);
+
+sub _debug {
+	print $l_fh "@_\n";
+}
 
 sub _log {
 	$out->print($j->encode([ 'log' => @_ ]), "\n");
-	print $l_fh "@_\n";
 }
 
-our $fun;
+our @fun;
 
 while(defined(my $line = $in->getline)) {
 	chomp $line;
-	_log $line if $ENV{DEBUG};
+	_debug $line;
 	my $input = $j->decode($line);
 	my ($cmd, @args) = @$input;
 
 	if ( $cmd eq 'reset' ) {
-		undef $fun;
+		@fun = ();
 		$out->print("true\n");
 	} elsif ( $cmd eq 'add_fun' ) {
-		$fun = eval $args[0];
+		push @fun, eval $args[0];
 		if ( $@ ) {
 			$out->print( qq|{"error": "$!", "reason": "$@"}\n| );
 		} else {
@@ -50,15 +54,14 @@ while(defined(my $line = $in->getline)) {
 		}
 	} elsif ( $cmd eq 'map_doc' ) {
 		my @results;
-		our $d;
-		local $d;
-		$d = eval { $fun->(@args) };
-		if ( $@ ) {
-			_log $@;
-		} else {
+		foreach my $fun ( @fun ) {
+			my $d = eval { $fun->(@args) };
+			_log $@ if $@;
 			push @results, [$d];
 		}
-		$out->print($j->utf8->encode( \@results ), "\n");
+		my $json = $j->utf8->encode( \@results );
+		$out->print("$json\n");
+		_debug "# $json";
 	} else {
 		_log "$cmd unimplemented", dump( $input );
 	}