X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4aab5f0a73e9e4643ce8174613bd700cf7c3ab68..f003e97d10e42ea97b4a03fd62a296fe993a9677:/IkiWiki/Plugin/external.pm

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index a5afdc4be..a90c5d8e2 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -59,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;
 				}
@@ -151,6 +153,18 @@ sub setstate ($$$$;@) { #{{{
 	return $IkiWiki::pagestate{$page}{$id}{$key}=@_;
 } #}}}
 
+sub getargv ($) { #{{{
+	my $plugin=shift;
+
+	return \@ARGV;
+} #}}}
+
+sub setargv ($@) { #{{{
+	my $plugin=shift;
+
+	@ARGV=@_;
+} #}}}
+
 sub inject ($@) { #{{{
 	# Bind a given perl function name to a particular RPC request.
 	my $plugin=shift;
@@ -177,7 +191,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;
 	});
 } #}}}