update

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

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 4bb4c2c2192ef857b61da9e63608dce2b58b5020..88303fc44b971c226c1d0bf02464a75f68d96006 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -29,26 +29,42 @@ my %linkcache;
 my $time=time;
 my @now=localtime($time);
 
 my $time=time;
 my @now=localtime($time);
 

-sub import { #{{{
-       hook(type => "needsbuild", id => "version", call => \&needsbuild);
+sub import {
+       hook(type => "getsetup", id => "calendar", call => \&getsetup);
+       hook(type => "needsbuild", id => "calendar", call => \&needsbuild);

        hook(type => "preprocess", id => "calendar", call => \&preprocess);
        hook(type => "preprocess", id => "calendar", call => \&preprocess);

-} #}}}
-
-sub is_leap_year (@) { #{{{
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+               archivebase => {
+                       type => "string",
+                       example => "archives",
+                       description => "base of the archives hierarchy",
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub is_leap_year (@) {

        my %params=@_;
        return ($params{year} % 4 == 0 && (($params{year} % 100 != 0) || $params{year} % 400 == 0));
        my %params=@_;
        return ($params{year} % 4 == 0 && (($params{year} % 100 != 0) || $params{year} % 400 == 0));

-} #}}}
+}

 
 

-sub month_days { #{{{
+sub month_days {

        my %params=@_;
        my $days_in_month = (31,28,31,30,31,30,31,31,30,31,30,31)[$params{month}-1];
        if ($params{month} == 2 && is_leap_year(%params)) {
                $days_in_month++;
        }
        return $days_in_month;
        my %params=@_;
        my $days_in_month = (31,28,31,30,31,30,31,31,30,31,30,31)[$params{month}-1];
        if ($params{month} == 2 && is_leap_year(%params)) {
                $days_in_month++;
        }
        return $days_in_month;

-} #}}}
+}

 
 

-sub format_month (@) { #{{{
+sub format_month (@) {

        my %params=@_;
 
        my $pagespec = $params{pages};
        my %params=@_;
 
        my $pagespec = $params{pages};


@@ -199,9 +215,9 @@ EOF
         add_depends($params{page}, join(" or ", @list));
 
        return $calendar;
         add_depends($params{page}, join(" or ", @list));
 
        return $calendar;

-} #}}}
+}

 
 

-sub format_year (@) { #{{{
+sub format_year (@) {

        my %params=@_;
 
        my $pagespec = $params{pages};
        my %params=@_;
 
        my $pagespec = $params{pages};


@@ -302,9 +318,9 @@ EOF
 EOF
 
        return $calendar;
 EOF
 
        return $calendar;

-} #}}}
+}

 
 

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

        my %params=@_;
        $params{pages} = "*"            unless defined $params{pages};
        $params{type}  = "month"        unless defined $params{type};
        my %params=@_;
        $params{pages} = "*"            unless defined $params{pages};
        $params{type}  = "month"        unless defined $params{type};


@@ -381,7 +397,7 @@ sub preprocess (@) { #{{{
        return "\n<div><div class=\"calendar\">$calendar</div></div>\n";
 } #}}
 
        return "\n<div><div class=\"calendar\">$calendar</div></div>\n";
 } #}}
 

-sub needsbuild (@) { #{{{
+sub needsbuild (@) {

        my $needsbuild=shift;
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{calendar}{nextchange}) {
        my $needsbuild=shift;
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{calendar}{nextchange}) {


@@ -390,7 +406,8 @@ sub needsbuild (@) { #{{{
                                # the current day
                                push @$needsbuild, $pagesources{$page};
                        }
                                # the current day
                                push @$needsbuild, $pagesources{$page};
                        }

-                       if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+                       if (exists $pagesources{$page} && 
+                           grep { $_ eq $pagesources{$page} } @$needsbuild) {

                                # remove state, will be re-added if
                                # the calendar is still there during the
                                # rebuild
                                # remove state, will be re-added if
                                # the calendar is still there during the
                                # rebuild


@@ -398,6 +415,6 @@ sub needsbuild (@) { #{{{
                        }
                }
        }
                        }
                }
        }

-} # }}}
+}

 
 1
 
 1