X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=events.pm;h=2999b1e1fb5f04b18fc710703b3b6163ea4beca1;hb=12803711b67b13707d6c0f79eddca5cb6bbdaa68;hp=dd1ed3e66331a253e14b5f43bb7091a59c8b7786;hpb=3588bbe03f12e52e6f6619a2167742d05b18aa21;p=ikiwiki%2Fevents.git

diff --git a/events.pm b/events.pm
index dd1ed3e..2999b1e 100644
--- a/events.pm
+++ b/events.pm
@@ -22,6 +22,7 @@ use warnings;
 use IkiWiki 3.00;
 use Time::Local;
 use DateTime;
+use CGI::FormBuilder;
 #use Data::Dumper;
 
 sub import {
@@ -154,11 +155,15 @@ sub date_of_page ($%) {
 	my $dir = IkiWiki::dirname($page);
 	my ($year, $month, $day, $hour, $hour_begin, $hour_end)
 	 = $dir =~ m{
-		.*/
-		(\d+)/
-		(01|02|03|04|05|06|07|08|09|10|11|12)/
-		(01|02|03|04|05|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)/
-		(([0-2][0-9]h[0-5][0-9])(-[0-2][0-9]h[0-5][0-9])?)?
+		.*?
+		/(\d+)
+		(?:/(01|02|03|04|05|06|07|08|09|10|11|12)
+			(?:/(01|02|03|04|05|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)
+				(?:/(([0-2][0-9]h[0-5][0-9])
+					(?:-([0-2][0-9]h[0-5][0-9]))?)
+				)?
+			)?
+		)?
 		$
 	 }x;
 	my $r =
@@ -173,13 +178,13 @@ sub date_of_page ($%) {
 	return $r;
  }
 sub event_of_page ($%) {
-	my ($event, %params) = @_;
+	my ($event, $date, %params) = @_;
 	my $title
 	 = exists $pagestate{$event}{meta}{title}
 	 ? $pagestate{$event}{meta}{title}
 	 : pagetitle(IkiWiki::basename($event));
 	my $hour
-	 = date_of_page($event)->{hour};
+	 = $date->{hour};
 	my $link
 	 = htmllink
 	 ( $params{page}
@@ -206,7 +211,7 @@ sub event_of_page ($%) {
 		 = htmllink
 		 ( $params{page}
 		 , $params{destpage}
-		 , $tag
+		 , '/'.$tag
 		 , linktext => $title
 		 , noimageinline => 1
 		 , title => $title );
@@ -222,6 +227,8 @@ sub event_of_page ($%) {
 	$base =~ s/[^a-zA-Z0-9-]/_/g;
 	return
 	 { hour => $hour
+	 , page => $event
+	 , date => $date
 	 , link => $link
 	 , tags => \@tags
 	 , base => $base };
@@ -234,16 +241,16 @@ sub events_of_pages ($%) {
 	foreach my $page (@$pages) {
 		my $date = date_of_page($page);
 		if (defined $date->{hour}) {
-			push @hour_events, $page;
+			push @hour_events, {page=>$page, date=>$date};
 		 }
 		else {
-			push @day_events, $page;
+			push @day_events, {page=>$page, date=>$date};
 		 }
 	 }
 	return
-	 map {event_of_page($_, %params)}
-	 ( (sort {lc $pagedir->($a) cmp lc $pagedir->($b)} @day_events)
-	 , (sort {lc $pagedir->($a) cmp lc $pagedir->($b)} @hour_events) );
+	 map {event_of_page($_->{page}, $_->{date}, %params)}
+	 ( (sort {lc IkiWiki::basename($a->{page}) cmp lc IkiWiki::basename($b->{page})} @day_events)
+	 , (sort {lc $a->{date}->{hour}.'/'.IkiWiki::basename($a->{page}) cmp lc $b->{date}->{hour}.'/'.IkiWiki::basename($b->{page})} @hour_events) );
  }
 sub event_html ($$%) {
 	my ($date, $format, %params) = @_;
@@ -337,7 +344,7 @@ sub event_html ($$%) {
 					 ?(month => $month):())
 				 , (($date->year() or $date->month() or $date->day())
 					 ?(year => $date->year()):())
-				 , do    => 'events'
+				 , do    => 'newevent'
 				 , page  => $params{destpage}
 				 )
 			 . qq{' rel='nofollow'>+</a>};
@@ -407,15 +414,9 @@ sub preprocess_month (@) {
 		# NOTE: add presence dependencies to update calendar when pages are added/removed
 	 );
 	
-	# NOTE: sort the pages by days of the month
-	my %days = map {($_=>[])} (1 .. $last_day);
-	foreach my $page (@pages) {
-		my $page_ctime = DateTime->from_epoch
-		 ( epoch     => $IkiWiki::pagectime{$page}
-		 , time_zone => 'local'
-		 , locale    => $config{locale}
-		 );
-		push @{$days{$page_ctime->day()}}, $page;
+	my %events_by_day = map {($_=>[])} (1 .. $last_day);
+	foreach my $event (events_of_pages(\@pages, %params)) {
+		push @{$events_by_day{$event->{date}->{day}}}, $event;
 	 }
 	
 	my $t='<tr>';
@@ -447,7 +448,7 @@ sub preprocess_month (@) {
 			 . "<ul class='tags'>".join("", @tags)."</ul>"
 			 . "</li>\n"
 		 }
-		 events_of_pages($days{$day->day()}, %params);
+		 @{$events_by_day{sprintf('%02d',$day->day())}};
 		$t .=
 		 "<span class='head'>"
 			 . "<span class='day'>"
@@ -495,6 +496,10 @@ sub preprocess_month (@) {
 sub preprocess (@) {
 	my %params = @_;
 	$params{focus} = $now->clone;
+	$params{focus}->set_hour(0);
+	$params{focus}->set_minute(0);
+	$params{focus}->set_second(0);
+	$params{focus}->set_nanosecond(0);
 	
 	$params{pages} = "*"        unless defined $params{pages};
 	$params{type}  = "month"    unless defined $params{type};
@@ -571,7 +576,7 @@ sub preprocess (@) {
 # new
 sub tmpl ($$) {
 	my ($base, $model) = @_;
-	my $page = IkiWiki::dirname($base).'/'.'templates/'.$model;
+	my $page = $base.'/'.'templates/'.$model;
 	my $file = defined srcfile($page, 1) ? '/'.$page : $model;
 	return template($file);
  }