X-Git-Url: http://git.cyclocoop.org/?p=ikiwiki%2Fevents.git;a=blobdiff_plain;f=events.pm;h=2820c60b70e187471614190af77be7f8ef996d96;hp=6e0d1da3cfea7c00a8027c01148da9205aa32f8e;hb=d8aede5b74879b2369cd12964f0039e89231d934;hpb=51377e1af6dd2c06c5e353b2804e7732926ecf9f

diff --git a/events.pm b/events.pm
index 6e0d1da..2820c60 100644
--- a/events.pm
+++ b/events.pm
@@ -202,7 +202,9 @@ sub event_of_page ($%) {
 		 (keys %{$IkiWiki::typedlinks{$event}{tag}}));
 	@tags
 	 = map {
-		my $tag = $_;
+		my $tag_best = bestlink($params{page}, $_);
+		$tag_best = (length $tag_best > 0 ? $tag_best : bestlink($event, $_));
+		my $tag = (length $tag_best > 0 ? $tag_best : $_);
 		my $title
 		 = exists $pagestate{$tag}{meta}{title}
 		 ? $pagestate{$tag}{meta}{title}
@@ -211,7 +213,7 @@ sub event_of_page ($%) {
 		 = htmllink
 		 ( $params{page}
 		 , $params{destpage}
-		 , '/'.$tag
+		 , $tag
 		 , linktext => $title
 		 , noimageinline => 1
 		 , title => $title );
@@ -288,7 +290,7 @@ sub event_html ($$%) {
 			 , $date->year()
 			 );
 			add_depends($params{page}, $year_page, deptype("presence"));
-			if ($pagesources{$year_page}) {
+			if (exists $pagesources{$year_page}) {
 				$year_html
 				 = htmllink
 				 ( $params{page}
@@ -307,7 +309,7 @@ sub event_html ($$%) {
 			 , $date->month()
 			 );
 			add_depends($params{page}, $month_page, deptype("presence"));
-			if ($pagesources{$month_page}) {
+			if (exists $pagesources{$month_page}) {
 				$month_html
 				 = htmllink
 				 ( $params{page}
@@ -327,7 +329,7 @@ sub event_html ($$%) {
 			 , $date->day()
 			 );
 			add_depends($params{page}, $day_page, deptype("presence"));
-			if ($pagesources{$day_page}) {
+			if (exists $pagesources{$day_page}) {
 				$day_html
 				 = htmllink
 				 ( $params{page}
@@ -516,47 +518,45 @@ sub preprocess (@) {
 		 ? $config{events_base}
 		 : gettext('Agenda');
 	 }
-	if (defined $params{day}) {
-		if ($params{day} =~ m/^([+-])(\d+)$/) {
-			my ($sign, $days) = ($1, $2);
-			my $duration = DateTime::Duration->new(days => $days, end_of_month => 'limit');
-			$params{focus}
-			 = $sign eq '+'
-			 ? $params{focus}->add_duration($duration)
-			 : $params{focus}->subtract_duration($duration);
-		 }
-		else {
-			$params{focus}->set(day => $params{day});
-		 }
+	
+	my %focus_set;
+	if (defined $params{day} and $params{day} =~ m/^(\d+)$/) {
+		my ($day) = ($1);
+		$focus_set{day} = $day;
 	 }
-	else {
-		#$params{focus}->set(day => 1);
+	if (defined $params{month} and $params{month} =~ m/^(\d+)$/) {
+		my ($month) = ($1);
+		$focus_set{month} = $month;
 	 }
-	if (defined $params{month}) {
-		if ($params{month} =~ m/^([+-])(\d+)$/) {
-			my ($sign, $months) = ($1, $2);
-			my $duration = DateTime::Duration->new(months => $months, end_of_month => 'limit');
-			$params{focus}
-			 = $sign eq '+'
-			 ? $params{focus}->add_duration($duration)
-			 : $params{focus}->subtract_duration($duration);
-		 }
-		else {
-			$params{focus}->set(month => $params{month});
-		 }
+	if (defined $params{year} and $params{year} =~ m/^(\d+)$/) {
+		my ($year) = ($1);
+		$focus_set{year} = $year;
 	 }
-	if (defined $params{year}) {
-		if ($params{year} =~ m/^([+-])(\d+)$/) {
-			my ($sign, $years) = ($1, $2);
-			my $duration = DateTime::Duration->new(years => $years, end_of_month => 'limit');
-			$params{focus}
-			 = $sign eq '+'
-			 ? $params{focus}->add_duration($duration)
-			 : $params{focus}->subtract_duration($duration);
-		 }
-		else {
-			$params{focus}->set(year => $params{year});
-		 }
+	$params{focus}->set(%focus_set);
+	
+	if (defined $params{day} and $params{day} =~ m/^([+-])(\d+)$/) {
+		my ($sign, $days) = ($1, $2);
+		my $duration = DateTime::Duration->new(days => $days, end_of_month => 'limit');
+		$params{focus}
+		 = $sign eq '+'
+		 ? $params{focus}->add_duration($duration)
+		 : $params{focus}->subtract_duration($duration);
+	 }
+	if (defined $params{month} and $params{month} =~ m/^([+-])(\d+)$/) {
+		my ($sign, $months) = ($1, $2);
+		my $duration = DateTime::Duration->new(months => $months, end_of_month => 'limit');
+		$params{focus}
+		 = $sign eq '+'
+		 ? $params{focus}->add_duration($duration)
+		 : $params{focus}->subtract_duration($duration);
+	 }
+	if (defined $params{year} and $params{year} =~ m/^([+-])(\d+)$/) {
+		my ($sign, $years) = ($1, $2);
+		my $duration = DateTime::Duration->new(years => $years, end_of_month => 'limit');
+		$params{focus}
+		 = $sign eq '+'
+		 ? $params{focus}->add_duration($duration)
+		 : $params{focus}->subtract_duration($duration);
 	 }
 	
 	#debug("events: focus=".$params{focus}->strftime('%Y-%m-%d_%H-%M-%S'));