[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0a3348f16ee9f8c3bba4da6951249914f88116b7

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  0a3348f16ee9f8c3bba4da6951249914f88116b7 (commit)
      from  0ba3e77dc9e406deb348f7bc5149bac273d470e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0a3348f16ee9f8c3bba4da6951249914f88116b7
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu Feb 12 13:08:52 2015 -0500

    LP#1425191 Restore summarization of serial units
    
    In a previous commit, code was added for force summaries to be limited
    to a certain type (to prevent cross type contamination of summaries).
    This had the negative side-effect of preventing summaries on units, as
    the units were not requesting a 'type' for their summary.
    
    While we could force the unit code to send a type, it seemed generally
    more flexible to restore the removed support for returning all summary
    information in the absense of a requested type.  This could lead to
    cross-type summaries for units, but that is a larger issue altogether
    (i.e. how we can properly support cross-type units at all).
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
index 07cd43a..50113eb 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
@@ -2086,7 +2086,18 @@ sub _summarize_contents {
     }
 
     my @formatted_parts;
-    my @scap_fields_ordered = $mfhd->field($MFHD_TAGS_BY_NAME{$type});
+    my @scap_fields_ordered;
+    if ($type) {
+        @scap_fields_ordered = $mfhd->field($MFHD_TAGS_BY_NAME{$type});
+    } else {
+        # if they didn't give a type, send back whatever holdings we have.
+        # this is really only sensible right now for summarizing one type,
+        # and is used by the unitize code for this purpose
+        #
+        # TODO: possible future support for binding (unitizing) of multiple
+        # types into a sensible summary string
+        @scap_fields_ordered = $mfhd->field('85[345]');
+    }
 
     foreach my $scap_field (@scap_fields_ordered) { #TODO: use generic MFHD "summarize" method, once available
         my @updated_holdings;

-----------------------------------------------------------------------

Summary of changes:
 .../src/perlmods/lib/OpenILS/Application/Serial.pm |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS