[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 6bc473afc1353e08b62ac0e49e4007dbcc0dba82

[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, rel_2_1 has been updated
       via  6bc473afc1353e08b62ac0e49e4007dbcc0dba82 (commit)
       via  cb8d70d4e4c475e9f948e5fab27ee2fb43567cef (commit)
      from  ac22cbadcc802be863a75bfe34955c23d27ecc15 (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 6bc473afc1353e08b62ac0e49e4007dbcc0dba82
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon Jul 18 11:00:26 2011 -0400

    Address minor code formatting consistency
    
    The rest of the code has spaces around the conditional clause in an if()
    statement, so do likewise here.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
index 22b64ca..f993615 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
@@ -170,8 +170,8 @@
                 /* take the call number and split it on whitespace */
                 callnum = String(volume.label());
             }
-            /* handle spine lables differently if using LC */
-            if(volume.label_class() == 3){
+            /* handle spine labels differently if using LC */
+            if (volume.label_class() == 3) {
                 /* for LC, split between classification subclass letters and numbers */
                 var lc_class_re = /^([A-Z]{1,3})([0-9]+.*?)$/i;
                 var lc_class_match = lc_class_re.exec(callnum);

commit cb8d70d4e4c475e9f948e5fab27ee2fb43567cef
Author: James Fournie <jfournie at sitka.bclibraries.ca>
Date:   Mon Jun 6 10:00:22 2011 -0700

    Spine label editor assumes LC as reported in LP #780665.
    
    This patch encapsulates the LC-assuming code in an IF block which
    considers the asset.call_number.volume.label_class.  If that is equal to
    3, it will use the LC formatting.
    
    Signed-off-by: James Fournie <jfournie at sitka.bclibraries.ca>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
index 04aff17..22b64ca 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
@@ -170,21 +170,23 @@
                 /* take the call number and split it on whitespace */
                 callnum = String(volume.label());
             }
+            /* handle spine lables differently if using LC */
+            if(volume.label_class() == 3){
+                /* for LC, split between classification subclass letters and numbers */
+                var lc_class_re = /^([A-Z]{1,3})([0-9]+.*?)$/i;
+                var lc_class_match = lc_class_re.exec(callnum);
+                if (lc_class_match && lc_class_match.length > 1) {
+                    callnum = lc_class_match[1] + ' ' + lc_class_match[2];
+                }
 
-            /* for LC, split between classification subclass letters and numbers */
-            var lc_class_re = /^([A-Z]{1,3})([0-9]+.*?)$/i;
-            var lc_class_match = lc_class_re.exec(callnum);
-            if (lc_class_match && lc_class_match.length > 1) {
-                callnum = lc_class_match[1] + ' ' + lc_class_match[2];
-            }
-
-            /* for LC, split between Cutter numbers */
-            var lc_cutter_re = /^(.*)(\.[A-Z]{1}[0-9]+.*?)$/ig;
-            var lc_cutter_match = lc_cutter_re.exec(callnum);
-            if (lc_cutter_match && lc_cutter_match.length > 1) {
-                callnum = '';
-                for (var i = 1; i < lc_cutter_match.length; i++) {
-                    callnum += lc_cutter_match[i] + ' ';
+                /* for LC, split between Cutter numbers */
+                var lc_cutter_re = /^(.*)(\.[A-Z]{1}[0-9]+.*?)$/ig;
+                var lc_cutter_match = lc_cutter_re.exec(callnum);
+                if (lc_cutter_match && lc_cutter_match.length > 1) {
+                    callnum = '';
+                    for (var i = 1; i < lc_cutter_match.length; i++) {
+                        callnum += lc_cutter_match[i] + ' ';
+                    }
                 }
             }
 

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

Summary of changes:
 .../xul/staff_client/server/cat/spine_labels.js    |   30 ++++++++++---------
 1 files changed, 16 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Evergreen ILS