From: Jason Stephenson <jstephenson@mvlc.org>
Date: Tue, 4 Feb 2014 17:56:41 +0000 (-0500)
Subject: Modify Marque.pm.in so --since "works" with --items and --lib.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fdyrcona%2Fmarque-export;p=working%2FEvergreen.git

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>
---

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: