Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / external.pm

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 4ce9c8babb62d45bacb3bb76a4773bd27cb09b5c..066f15cf1b2f12ef4a027e5c9842d1b859358f23 100644 (file)
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -6,7 +6,7 @@ package IkiWiki::Plugin::external;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use RPC::XML;
 use RPC::XML::Parser;
 use IPC::Open2;
 use RPC::XML;
 use RPC::XML::Parser;
 use IPC::Open2;


@@ -14,7 +14,7 @@ use IO::Handle;
 
 my %plugins;
 
 
 my %plugins;
 

-sub import { #{{{
+sub import {

        my $self=shift;
        my $plugin=shift;
        return unless defined $plugin;
        my $self=shift;
        my $plugin=shift;
        return unless defined $plugin;


@@ -32,17 +32,17 @@ sub import { #{{{
        $RPC::XML::ENCODING="utf-8";
 
        rpc_call($plugins{$plugin}, "import");
        $RPC::XML::ENCODING="utf-8";
 
        rpc_call($plugins{$plugin}, "import");

-} #}}}
+}

 
 

-sub rpc_write ($$) { #{{{
+sub rpc_write ($$) {

        my $fh=shift;
        my $string=shift;
 
        $fh->print($string."\n");
        $fh->flush;
        my $fh=shift;
        my $string=shift;
 
        $fh->print($string."\n");
        $fh->flush;

-} #}}}
+}

 
 

-sub rpc_call ($$;@) { #{{{
+sub rpc_call ($$;@) {

        my $plugin=shift;
        my $command=shift;
 
        my $plugin=shift;
        my $command=shift;
 


@@ -131,12 +131,12 @@ sub rpc_call ($$;@) { #{{{
        }
 
        return undef;
        }
 
        return undef;

-} #}}}
+}

 
 package IkiWiki::RPC::XML;
 use Memoize;
 
 
 package IkiWiki::RPC::XML;
 use Memoize;
 

-sub getvar ($$$) { #{{{
+sub getvar ($$$) {

        my $plugin=shift;
        my $varname="IkiWiki::".shift;
        my $key=shift;
        my $plugin=shift;
        my $varname="IkiWiki::".shift;
        my $key=shift;


@@ -145,9 +145,9 @@ sub getvar ($$$) { #{{{
        my $ret=$varname->{$key};
        use strict 'refs';
        return $ret;
        my $ret=$varname->{$key};
        use strict 'refs';
        return $ret;

-} #}}}
+}

 
 

-sub setvar ($$$;@) { #{{{
+sub setvar ($$$;@) {

        my $plugin=shift;
        my $varname="IkiWiki::".shift;
        my $key=shift;
        my $plugin=shift;
        my $varname="IkiWiki::".shift;
        my $key=shift;


@@ -157,18 +157,18 @@ sub setvar ($$$;@) { #{{{
        my $ret=$varname->{$key}=$value;
        use strict 'refs';
        return $ret;
        my $ret=$varname->{$key}=$value;
        use strict 'refs';
        return $ret;

-} #}}}
+}

 
 

-sub getstate ($$$$) { #{{{
+sub getstate ($$$$) {

        my $plugin=shift;
        my $page=shift;
        my $id=shift;
        my $key=shift;
 
        return $IkiWiki::pagestate{$page}{$id}{$key};
        my $plugin=shift;
        my $page=shift;
        my $id=shift;
        my $key=shift;
 
        return $IkiWiki::pagestate{$page}{$id}{$key};

-} #}}}
+}

 
 

-sub setstate ($$$$;@) { #{{{
+sub setstate ($$$$;@) {

        my $plugin=shift;
        my $page=shift;
        my $id=shift;
        my $plugin=shift;
        my $page=shift;
        my $id=shift;


@@ -176,22 +176,22 @@ sub setstate ($$$$;@) { #{{{
        my $value=shift;
 
        return $IkiWiki::pagestate{$page}{$id}{$key}=$value;
        my $value=shift;
 
        return $IkiWiki::pagestate{$page}{$id}{$key}=$value;

-} #}}}
+}

 
 

-sub getargv ($) { #{{{
+sub getargv ($) {

        my $plugin=shift;
 
        return \@ARGV;
        my $plugin=shift;
 
        return \@ARGV;

-} #}}}
+}

 
 

-sub setargv ($@) { #{{{
+sub setargv ($@) {

        my $plugin=shift;
        my $array=shift;
 
        @ARGV=@$array;
        my $plugin=shift;
        my $array=shift;
 
        @ARGV=@$array;

-} #}}}
+}

 
 

-sub inject ($@) { #{{{
+sub inject ($@) {

        # Bind a given perl function name to a particular RPC request.
        my $plugin=shift;
        my %params=@_;
        # Bind a given perl function name to a particular RPC request.
        my $plugin=shift;
        my %params=@_;


@@ -213,9 +213,9 @@ sub inject ($@) { #{{{
        # the injected version.
        IkiWiki::inject(name => $params{name}, call => $sub);
        return 1;
        # the injected version.
        IkiWiki::inject(name => $params{name}, call => $sub);
        return 1;

-} #}}}
+}

 
 

-sub hook ($@) { #{{{
+sub hook ($@) {

        # the call parameter is a function name to call, since XML RPC
        # cannot pass a function reference
        my $plugin=shift;
        # the call parameter is a function name to call, since XML RPC
        # cannot pass a function reference
        my $plugin=shift;


@@ -227,13 +227,13 @@ sub hook ($@) { #{{{
        IkiWiki::hook(%params, call => sub {
                IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_);
        });
        IkiWiki::hook(%params, call => sub {
                IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_);
        });

-} #}}}
+}

 
 

-sub pagespec_match ($@) { #{{{
+sub pagespec_match ($@) {

        # convert pagespec_match's return object into a XML RPC boolean
        my $plugin=shift;
 
        return RPC::XML::boolean->new(0 + IkiWiki::pagespec_march(@_));
        # convert pagespec_match's return object into a XML RPC boolean
        my $plugin=shift;
 
        return RPC::XML::boolean->new(0 + IkiWiki::pagespec_march(@_));

-} #}}}
+}

 
 1
 
 1