improvements to readability suggested by Thomas Berezansky -- thanks, again, for...

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/biblio.pm
index 689ae92..0d2f150 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/biblio.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/biblio.pm
@@ -389,7 +389,7 @@ sub record_copy_status_count {
        my $sql = <<"   SQL";
 
                SELECT  cp.circ_lib,
-                               cnp.label || CASE WHEN cnp.label <> '' THEN ' ' ELSE '' END || cn.label || CASE WHEN cns.label <> '' THEN ' ' ELSE '' END || cns.label,
+                               CASE WHEN cnp.id > -1 THEN cnp.label || ' ' ELSE '' END || cn.label || CASE WHEN cns.id > -1 THEN ' ' || cns.label ELSE '' END,
                                cp.status,
                                count(cp.id)
                  FROM  $cp_table cp,
@@ -461,6 +461,7 @@ sub record_copy_status_location_count {
        my $sql = <<"   SQL";
 
                SELECT  cp.circ_lib,
+                               CASE WHEN cnp.id > -1 THEN cnp.label || ' ' ELSE '' END || cn.label || CASE WHEN cns.id > -1 THEN ' ' || cns.label ELSE '' END,
                                cnp.label || CASE WHEN cnp.label <> '' THEN ' ' ELSE '' END || cn.label || CASE WHEN cns.label <> '' THEN ' ' ELSE '' END || cns.label,
                                oils_i18n_xlate('asset.copy_location', 'acpl', 'name', 'id', cl.id::TEXT, ?),
                                cp.status,