From: miker Date: Wed, 15 Jul 2009 16:49:48 +0000 (+0000) Subject: Merging 13602 from trunk: check for a null circ mod on an item when doing a non-null... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f987ab17c82734c5b88a77f2cf7f202703e8f7ed;p=working%2FEvergreen.git Merging 13602 from trunk: check for a null circ mod on an item when doing a non-null circ_mod test git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@13603 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/sql/Pg/100.circ_matrix.sql b/Open-ILS/src/sql/Pg/100.circ_matrix.sql index 33733e4f5e..24a5d42b2f 100644 --- a/Open-ILS/src/sql/Pg/100.circ_matrix.sql +++ b/Open-ILS/src/sql/Pg/100.circ_matrix.sql @@ -166,7 +166,7 @@ BEGIN CASE WHEN m.usr_age_upper_bound IS NOT NULL THEN 0.5 ELSE 0 END DESC LOOP IF current_mp.circ_modifier IS NOT NULL THEN - CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier; + CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier OR item_object.circ_modifier IS NULL; END IF; IF current_mp.marc_type IS NOT NULL THEN diff --git a/Open-ILS/src/sql/Pg/110.hold_matrix.sql b/Open-ILS/src/sql/Pg/110.hold_matrix.sql index a966737252..2da8808670 100644 --- a/Open-ILS/src/sql/Pg/110.hold_matrix.sql +++ b/Open-ILS/src/sql/Pg/110.hold_matrix.sql @@ -93,7 +93,7 @@ BEGIN current_mp_weight := 5.0; IF current_mp.circ_modifier IS NOT NULL THEN - CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier; + CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier OR item_object.circ_modifier IS NULL; END IF; IF current_mp.marc_type IS NOT NULL THEN