X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/055179cb4cc9b8bc9b204e1a9f83b1f59e13824e..d85c9660c5ce6f9749f3afc5c51342caf7713263:/IkiWiki/Plugin/external.pm

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 8d1baa587..4c2e5d2fe 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -29,6 +29,7 @@ sub import { #{{{
 
 	$plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid,
 		accum => ""};
+	$RPC::XML::ENCODING="utf-8";
 
 	rpc_call($plugins{$plugin}, "import");
 } #}}}
@@ -58,15 +59,17 @@ sub rpc_call ($$;@) { #{{{
 			error("XML RPC parser failure: $r") unless ref $r;
 			if ($r->isa('RPC::XML::response')) {
 				my $value=$r->value;
-				if ($value->isa('RPC::XML::array')) {
+				if ($r->is_fault($value)) {
+					# throw the error as best we can
+					print STDERR $value->string."\n";
+					return "";
+				}
+				elsif ($value->isa('RPC::XML::array')) {
 					return @{$value->value};
 				}
 				elsif ($value->isa('RPC::XML::struct')) {
 					return %{$value->value};
 				}
-				elsif ($value->isa('RPC::XML::fault')) {
-					die $value->string;
-				}
 				else {
 					return $value->value;
 				}
@@ -125,9 +128,10 @@ sub setvar ($$$;@) { #{{{
 	my $plugin=shift;
 	my $varname="IkiWiki::".shift;
 	my $key=shift;
+	my $value=shift;
 
 	no strict 'refs';
-	my $ret=$varname->{$key}=@_;
+	my $ret=$varname->{$key}=$value;
 	use strict 'refs';
 	return $ret;
 } #}}}
@@ -146,8 +150,22 @@ sub setstate ($$$$;@) { #{{{
 	my $page=shift;
 	my $id=shift;
 	my $key=shift;
+	my $value=shift;
+
+	return $IkiWiki::pagestate{$page}{$id}{$key}=$value;
+} #}}}
+
+sub getargv ($) { #{{{
+	my $plugin=shift;
+
+	return \@ARGV;
+} #}}}
+
+sub setargv ($@) { #{{{
+	my $plugin=shift;
+	my $array=shift;
 
-	return $IkiWiki::pagestate{$page}{$id}{$key}=@_;
+	@ARGV=@$array;
 } #}}}
 
 sub inject ($@) { #{{{
@@ -176,7 +194,8 @@ sub hook ($@) { #{{{
 	delete $params{call};
 
 	IkiWiki::hook(%params, call => sub {
-		IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_)
+		my $ret=IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_);
+		return $ret;
 	});
 } #}}}