From e48c79dd40e3103f412cacb261222f8ac70b2f3b Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jstephenson@mvlc.org>
Date: Tue, 4 Feb 2014 12:56:41 -0500
Subject: [PATCH] Modify Marque.pm.in so --since "works" with --items and
 --lib.

When the --since option is specified with --items and/or --lib,
don't include the deleted = 'f' restrictions on acp and acn.
This is because we want to build an update file of MARC records
since the given date, so we want to include deleted MARC records
with 'd' in the leader's 05.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---
 Open-ILS/src/support-scripts/Marque.pm.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/support-scripts/Marque.pm.in b/Open-ILS/src/support-scripts/Marque.pm.in
index 8e5ab93a42..13147c9d58 100644
--- a/Open-ILS/src/support-scripts/Marque.pm.in
+++ b/Open-ILS/src/support-scripts/Marque.pm.in
@@ -372,19 +372,19 @@ sub build_query {
         $from .= <<ACN_JOIN;
 
 join $acnTable on $acnTable.record = $breTable.id
-and $acnTable.deleted = 'f'
 and $acnTable.owning_lib in (
 ACN_JOIN
         $from .= join(',', @{$self->{libs}}) . ")";
+        $from .= "\nand $acnTable.deleted = 'f'" unless ($Marque::config->option_value('since'));
     }
 
     if ($Marque::config->option_value('items')) {
         unless ($acn_joined) {
             $from .= "\njoin $acnTable on $acnTable.record = $breTable.id";
-            $from .= "\nand $acnTable.deleted = 'f'";
+            $from .= "\nand $acnTable.deleted = 'f'" unless ($Marque::config->option_value('since'));
         }
         $from .= "\njoin $acpTable on $acpTable.call_number = $acnTable.id";
-        $from .= "\nand $acpTable.deleted = 'f'";
+        $from .= "\nand $acpTable.deleted = 'f'" unless ($Marque::config->option_value('since'));
     }
 
     # The where really depends on a few options:
-- 
2.11.0