From: miker Date: Mon, 16 Nov 2009 18:27:51 +0000 (+0000) Subject: loop-ending comparison thinko in recent SpanSet changes X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=75d9c756acaaa399588928cc5be141b2e5cee348;p=evergreen%2Fpines.git loop-ending comparison thinko in recent SpanSet changes git-svn-id: svn://svn.open-ils.org/ILS/trunk@14922 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm index 0b8afca44a..d7482e4d51 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm @@ -271,6 +271,7 @@ sub org_closed_overlap { return undef unless ($date && $ou); + # we're given a date and a direction, find any closures that contain the date my $t = actor::org_unit::closed_date->table; my $sql = <<" SQL"; SELECT * @@ -286,6 +287,7 @@ sub org_closed_overlap { my $target_date = $_dt_parser->parse_datetime( $date ); my ($begin, $end) = ($target_date, $target_date); + # create a spanset from the closures that contain the $date my $closure_spanset = make_closure_spanset( actor::org_unit::closed_date->db_Main->selectall_hashref( $sql, 'id', {}, $date, $ou ) ); @@ -340,11 +342,11 @@ sub org_closed_overlap { } } - if ($begin eq $date && $end eq $date) { - return undef; - } + my $start = $begin->strftime('%FT%T%z'); + my $stop = $end->strftime('%FT%T%z') }; - return { start => $begin->strftime('%FT%T%z'), end => $end->strftime('%FT%T%z') }; + return undef if ($start eq $stop); + return { start => $start, end => $stop }; } __PACKAGE__->register_method( api_name => 'open-ils.storage.actor.org_unit.closed_date.overlap',