don't show an error if the image is missing, instead, a broken link

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index bae8e14327d5e2761e01a8aeddd33566e0741c04..f0e3c223c5523a3c40cb47909099bfc2972e9b76 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -10,7 +10,8 @@ my %tags;
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);

-       hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
+       hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
+       hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);

        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 
        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 


@@ -32,7 +33,7 @@ sub tagpage ($) { #{{{
        return $tag;
 } #}}}
 
        return $tag;
 } #}}}
 

-sub preprocess (@) { #{{{
+sub preprocess_tag (@) { #{{{

        if (! @_) {
                return "";
        }
        if (! @_) {
                return "";
        }


@@ -52,6 +53,33 @@ sub preprocess (@) { #{{{
        return "";
 } # }}}
 
        return "";
 } # }}}
 

+sub preprocess_taglink (@) { #{{{
+       if (! @_) {
+               return "";
+       }
+       my %params=@_;
+       return join(" ", map {
+               if (/(.*)\|(.*)/) {
+                       my $tag=IkiWiki::linkpage($2);
+                       $tags{$params{page}}{$tag}=1;
+                       push @{$links{$params{page}}}, tagpage($tag);
+                       return htmllink($params{page}, $params{destpage},
+                               tagpage($tag),
+                               linktext => IkiWiki::pagetitle($1));
+               }
+               else {
+                       my $tag=IkiWiki::linkpage($_);
+                       $tags{$params{page}}{$tag}=1;
+                       push @{$links{$params{page}}}, tagpage($tag);
+                       return htmllink($params{page}, $params{destpage},
+                               tagpage($tag));
+               }
+       }
+       grep {
+               $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
+       } keys %params);
+} # }}}
+

 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};
 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};