[open-ils-commits] r13512 - in trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD: . test (djfiander)

[svn at svn.open-ils.org]

Author: djfiander
Date: 2009-07-06 21:21:39 -0400 (Mon, 06 Jul 2009)
New Revision: 13512

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Date.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/test/mfhd.t
Log:
Add some more complex publication patterns, fix code so they pass.

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Date.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Date.pm	2009-07-06 23:45:15 UTC (rev 13511)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/Date.pm	2009-07-07 01:21:39 UTC (rev 13512)
@@ -130,12 +130,12 @@
     my $dt = shift;
     my $week = shift;
     my $day = shift;
-    my ($nth_day, $dow, $day);
+    my ($nth_day, $dow);
 
-    $day = $daynames{$day};
+#     printf("# nth_week_of_month(dt, '%s', '%s')\n", $week, $day);
 
     if (0 < $week && $week <= 5) {
-	$nth_day = DateTime->clone($dt)->set(day => 1);
+	$nth_day = $dt->clone->set(day => 1);
     } elsif ($week >= 97) {
 	$nth_day = DateTime->last_day_of_month(year  => $dt->year,
 					       month => $dt->month);
@@ -145,13 +145,22 @@
 
     $dow = $nth_day->day_of_week();
 
+    # If a particular day was passed in (eg, we want 3rd friday)
+    # then use that day for the calculations, otherwise, just use
+    # the day of the week of the original date (the date $dt).
+    if (defined($day)) {
+	$day = $daynames{$day};
+    } else {
+	$day = $dt->day_of_week;
+    }
+
     if ($week <= 5) {
 	# count forwards
 	$nth_day->add(days => ($day - $dow + 7) % 7,
 		      weeks=> $week - 1);
     } else {
 	# count backwards
-	$nth_day->subtract(days => ($day - $nth_day->day_of_week + 7) % 7);
+	$nth_day->subtract(days => ($day - $dow + 7) % 7);
 
 	# 99: last week of month, 98: second last, etc.
 	for (my $i = 99 - $week; $i > 0; $i--) {
@@ -175,6 +184,8 @@
     my $weekno = shift;
     my $day = shift;
 
+#     printf("check_date('%s', '%s', '%s')\n", $month, $weekno, $day || '');
+
     if (!defined $day) {
 	# MMWW
 	return (($dt->month == $month)
@@ -246,17 +257,28 @@
     my $pat = shift;
     my @cur = @_;
     my $candidate;
-    my $dt = DateTime->new(year => $cur[0],
-			   month=> $cur[1],
-			   day  => $cur[2]);
+    my $dt;
 
-    if ($pat =~ m/^$weekpat$daypat$/) {
+#     printf("# subsequent_week('%s', '%s', '%s', '%s')\n", $pat, @cur);
+
+    $dt = DateTime->new(year => $cur[0],
+			month=> $cur[1],
+			day  => $cur[2]);
+
+    if ($pat =~ m/^$weekpat$daypat$/o) {
 	# WWdd: published on given weekday of given week of every month
 	my ($week, $day) = ($1, $2);
 
+# 	printf("# subsequent_week: matched /WWdd/: week='%s', day='%s'\n",
+# 	       $week, $day);
+
 	if ($week eq '00') {
 	    # Every week
 	    $candidate = DateTime->clone($dt);
+
+# 	    printf("# subsequent_week: DateTime->clone() failed\n")
+# 	      if !defined($candidate);
+
 	    if ($dt->day_of_week == $daynames{$day}) {
 		# Current is right day, next one is a week hence
 		$candidate->add(days => 7);
@@ -268,13 +290,17 @@
 	    $candidate = nth_week_of_month($dt, $week, $day);
 	}
 
-	if ($candidate < $dt) {
-	    # If the n'th week of the month happens before the
+	if ($candidate <= $dt) {
+	    # If the n'th week of the month happens on before the
 	    # current issue, then the next issue is published next
 	    # month, otherwise, it's published this month.
 	    # This will never happen for the "00: every week" pattern
-	    $candidate = DateTime->clone($dt)->add(months => 1)->set(day => 1);
-	    $candidate = nth_week_of_month($dt, $week, $day);
+# 	    printf("# subsequent_week: candidate (%s) occurs on or before current date (%s)\n",
+# 		   join('/', $candidate->year, $candidate->month, $candidate->day),
+# 		   join('/', $dt->year, $dt->month, $dt->day));
+	    $candidate->set(day => 1);
+	    $candidate->add(months => 1);
+	    $candidate = nth_week_of_month($candidate, $week, $day);
 	}
     } elsif ($pat =~ m/^$monthpat$weekpat$daypat$/) {
 	# MMWWdd: published on given weekday of given week of given month
@@ -284,7 +310,7 @@
 				   month=> $month,
 				   day  => 1);
 	$candidate = nth_week_of_month($candidate, $week, $day);
-	if ($candidate < $dt) {
+	if ($candidate <= $dt) {
 	    # We've missed it for this year, next one that matches
 	    # will be next year
 	    $candidate->add(years => 1)->set(day => 1);
@@ -299,7 +325,7 @@
 						     day  => 1),
 				       $week,
 				       'th');
-	if ($candidate < $dt) {
+	if ($candidate <= $dt) {
 	    # Already past the pattern date this year, move to next year
 	    $candidate->add(years => 1)->set(day => 1);
 	    $candidate = nth_week_of_month($candidate, $week, 'th');

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/test/mfhd.t
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/test/mfhd.t	2009-07-06 23:45:15 UTC (rev 13511)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Utils/MFHD/test/mfhd.t	2009-07-07 01:21:39 UTC (rev 13512)
@@ -222,3 +222,9 @@
 863 41 $821.1$a100$b1200$i2008$j12$k06$x|a100|b1201|i2008|j12|k13$zwithin vol.
 863 41 $821.2$a100$b1201$i2008$j12$k13$x|a100|b1202|i2008|j12|k20$zwithin vol. combined iss.
 863 41 $821.3$a100$b1202$i2008$j12$k20$x|a101|b1203|i2009|j01|k03$zvolume change over omitted iss.
+
+245 00 $aMFHD example: monthly, pub. 2nd Wed of month except in April: 2nd Thu; May:1st Wednesday.
+853 20 $822$av.$bno.$u12$vr$i(year)$j(month)$k(day)$wm$x01$ypw02we$ypw0402th,0501we$yow0402we,0502we
+863 41 $822.1$a1$b2$i2009$j02$k11$x|a1|b3|i2009|j03|k11$zpublished on 2nd Wed in Mar
+863 41 $822.2$a1$b3$i2009$j03$k11$x|a1|b4|i2009|j04|k09$zpublished on 2nd Thu in Apr
+863 41 $822.3$a1$b4$i2009$j04$k09$x|a1|b5|i2009|j05|k06$zpublished on 1st Wed in May