This commit breaks compatibility with OpenSRF 0.9.

Removes JSON.js copies from EG trunk.
JSON_v0.js (legacy JSON) and JSON_v1.js (modern JSON) are copied from the installed OpenSRF javascript libs.
ScriptRunner.pm no longer loads another copy of JSON.js from <DATA>.
All Evergreen files now use modern JSON (JSON_v1.js).

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7894 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/xul/staff_client/server/patron/ue.xhtml b/Evergreen/xul/staff_client/server/patron/ue.xhtml
index bdbefc0..e3cecf3 100644 (file)
--- a/Evergreen/xul/staff_client/server/patron/ue.xhtml
+++ b/Evergreen/xul/staff_client/server/patron/ue.xhtml
@@ -16,7 +16,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/examples/opensrf.xml.example b/Open-ILS/examples/opensrf.xml.example
index 9c77656..7239f46 100644 (file)
--- a/Open-ILS/examples/opensrf.xml.example
+++ b/Open-ILS/examples/opensrf.xml.example
@@ -377,6 +377,7 @@ Example opensrf config file for OpenILS
                 </unix_config>
                 <app_settings>
                     <patron_penalty>penalty/patron_penalty.js</patron_penalty>
+                    <script_path>/openils/lib/javascript</script_path>
                     <script_path>/openils/var</script_path>
                     <script_path>/openils/var/catalog</script_path>
                 </app_settings>
@@ -404,6 +405,7 @@ Example opensrf config file for OpenILS
                     </notify_hold>
 
                     <!-- circulation policy scripts -->
+                    <script_path>/openils/lib/javascript</script_path>
                     <script_path>/openils/var</script_path>
                     <script_path>/openils/var/catalog</script_path>
                     <scripts> 
@@ -494,6 +496,7 @@ Example opensrf config file for OpenILS
                     <max_spare_children>5</max_spare_children>
                 </unix_config>
                 <app_settings>
+                    <script_path>/openils/lib/javascript/</script_path>
                     <script_path>/openils/var/catalog/</script_path>
                     <script_path>/openils/var/web/opac/common/js/</script_path>
                     <scripts>
@@ -519,6 +522,7 @@ Example opensrf config file for OpenILS
                     <max_spare_children>5</max_spare_children>
                 </unix_config>
                 <app_settings>
+                    <script_path>/openils/lib/javascript/</script_path>
                     <script_path>/openils/var/catalog/</script_path>
                     <scripts>
                         <biblio_fingerprint>biblio_fingerprint.js</biblio_fingerprint>

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index 7014157..fdf8080 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -70,6 +70,7 @@ webcore-install:
        mkdir -p $(WEBDIR)
        mkdir -p $(WEBDIR)/opac/extras/xsl/
        cp -r ../web/* $(WEBDIR)
+       cp $(OPENSRF_LIBS)/javascript/* $(WEBDIR)/opac/common/js/
        ln -sf $(WEBDIR)/opac/skin/default/xml/index.xml $(WEBDIR)/opac/skin/default/xml/mresult.xml
        ln -sf $(WEBDIR)/opac/skin/default/xml/index.xml $(WEBDIR)/opac/skin/default/xml/rresult.xml
        ln -sf $(WEBDIR)/opac/skin/default/xml/index.xml $(WEBDIR)/opac/skin/default/xml/rdetail.xml

diff --git a/Open-ILS/src/javascript/backend/catalog/biblio_descriptor.js b/Open-ILS/src/javascript/backend/catalog/biblio_descriptor.js
index fb2b9aa..492882d 100644 (file)
--- a/Open-ILS/src/javascript/backend/catalog/biblio_descriptor.js
+++ b/Open-ILS/src/javascript/backend/catalog/biblio_descriptor.js
@@ -2,6 +2,7 @@
 load_lib('fmall.js');
 load_lib('fmgen.js');
 load_lib('record_type.js');
+load_lib('JSON_v1.js');
 
 var marcdoc = new XML(environment.marc);
 var marc_ns = new Namespace('http://www.loc.gov/MARC21/slim');

diff --git a/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js b/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js
index 15b991e..83992c2 100644 (file)
--- a/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js
+++ b/Open-ILS/src/javascript/backend/catalog/biblio_fingerprint.js
@@ -1,5 +1,6 @@
 // so we can tell if it's a book or other type
 load_lib('record_type.js');
+load_lib('JSON_v1.js');
 
 environment.result = {};
 

diff --git a/Open-ILS/src/javascript/backend/catalog/record_type.js b/Open-ILS/src/javascript/backend/catalog/record_type.js
index edb7ccb..0a6988b 100644 (file)
--- a/Open-ILS/src/javascript/backend/catalog/record_type.js
+++ b/Open-ILS/src/javascript/backend/catalog/record_type.js
@@ -1,6 +1,7 @@
 // Constants ...
 load_lib('phys_char.js');
 load_lib('fixed_fields.js');
+load_lib('JSON_v1.js');
 
 function recordType (rec) {
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_duration.js b/Open-ILS/src/javascript/backend/circ/circ_duration.js
index 55468ab..6f6a3d4 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_duration.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_duration.js
@@ -1,6 +1,7 @@
 function go(){
 
 load_lib('circ/circ_item_config.js');
+load_lib('JSON_v1.js');
 log_vars('circ_duration');
 
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_item_config.js b/Open-ILS/src/javascript/backend/circ/circ_item_config.js
index cc07951..9cfd946 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_item_config.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_item_config.js
@@ -1,4 +1,5 @@
 load_lib('circ/circ_lib.js');
+load_lib('JSON_v1.js');
 log_debug('loading circ_item_config.js ...');
 
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_lib.js b/Open-ILS/src/javascript/backend/circ/circ_lib.js
index acf80aa..5cad8b4 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_lib.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_lib.js
@@ -1,5 +1,6 @@
 load_lib('catalog/record_type.js');
 load_lib('circ/circ_groups.js');
+load_lib('JSON_v1.js');
 
 
 try {

diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
index a08e897..6043e5f 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
@@ -2,6 +2,7 @@ function go() {
 
 /* load the lib script */
 load_lib('circ/circ_lib.js');
+load_lib('JSON_v1.js');
 log_vars('circ_permit_copy');
 
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js b/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
index 2474a5e..142c052 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
@@ -1,6 +1,7 @@
 function go() {
 
 load_lib('circ/circ_lib.js');
+load_lib('JSON_v1.js');
 log_vars('circ_permit_hold');
 
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js b/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js
index da6f719..9549688 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_patron.js
@@ -2,6 +2,7 @@ function go() {
 
 /* load the script library */
 load_lib('circ/circ_lib.js');
+load_lib('JSON_v1.js');
 log_vars('circ_permit_patron');
 
 

diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_renew.js b/Open-ILS/src/javascript/backend/circ/circ_permit_renew.js
index aca8de0..2eaac55 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_renew.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_renew.js
@@ -2,6 +2,7 @@ function go() {
 
 /* load the lib script */
 load_lib('circ/circ_lib.js');
+load_lib('JSON_v1.js');
 log_vars('circ_permit_renew');
 
 } go();

diff --git a/Open-ILS/src/javascript/backend/libs/JSON.js b/Open-ILS/src/javascript/backend/libs/JSON.js
deleted file mode 100644 (file)
index 1f7b805..0000000
--- a/Open-ILS/src/javascript/backend/libs/JSON.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// in case we run on an implimentation that doesn't have "undefined";
-var undefined;
-
-function Cast (obj, class_constructor) {
-       try {
-               if (eval(class_constructor + '["_isfieldmapper"]')) {
-                       obj = eval("new " + class_constructor + "(obj)");
-               }
-       } catch( E ) {
-               alert( E + "\n");
-       } finally {
-               return obj;
-       }
-}
-
-function JSON2js (json) {
-
-       json = String(json).replace( /\/\*--\s*S\w*?\s*?\s+\w+\s*--\*\//g, 'Cast(');
-       json = String(json).replace( /\/\*--\s*E\w*?\s*?\s+(\w+)\s*--\*\//g, ', "$1")');
-
-       var obj;
-       if (json != '') {
-               try {
-                       eval( 'obj = ' + json );
-               } catch(E) {
-                       debug("Error building JSON object with string " + E + "\nString:\n" + json );
-                       return null;
-               }
-       }
-       return obj;
-}
-
-
-function object2Array(obj) {
-       if( obj == null ) return null;
-
-       var arr = new Array();
-       for( var i  = 0; i < obj.length; i++ ) {
-               arr[i] = obj[i];
-       }
-       return arr;
-}
-
-
-function js2JSON(arg) {
-       return _js2JSON(arg);
-}
-
-function _js2JSON(arg) {
-       var i, o, u, v;
-
-               switch (typeof arg) {
-                       case 'object':
-       
-                               if(arg) {
-       
-                                       if (arg._isfieldmapper) { /* magi-c-ast for fieldmapper objects */
-       
-                                               if( arg.a.constructor != Array ) {
-                                                       var arr = new Array();
-                                                       for( var i  = 0; i < arg.a.length; i++ ) {
-                                                               if( arg.a[i] == null ) {
-                                                                       arr[i] = null; continue;
-                                                               }
-       
-                                                               if( typeof arg.a[i] != 'object' ) { 
-                                                                       arr[i] = arg.a[i];
-       
-                                                               } else if( typeof arg.a[i] == 'object' 
-                                                                                       && arg.a[i]._isfieldmapper) {
-       
-                                                                       arr[i] = arg.a[i];
-       
-                                                               } else {
-                                                                       arr[i] = object2Array(arg.a[i]);                
-                                                               }
-                                                       }
-                                                       arg.a = arr;
-                                               }
-       
-                                               return "/*--S " + arg.classname + " --*/" + js2JSON(arg.a) + "/*--E " + arg.classname + " --*/";
-       
-                                       } else {
-       
-                                               if (arg.constructor == Array) {
-                                                       o = '';
-                                                       for (i = 0; i < arg.length; ++i) {
-                                                               v = js2JSON(arg[i]);
-                                                               if (o) {
-                                                                       o += ',';
-                                                               }
-                                                               if (v !== u) {
-                                                                       o += v;
-                                                               } else {
-                                                                       o += 'null';
-                                                               }
-                                                       }
-                                                       return '[' + o + ']';
-       
-                                               } else if (typeof arg.toString != 'undefined') {
-                                                       o = '';
-                                                       for (i in arg) {
-                                                               v = js2JSON(arg[i]);
-                                                               if (v !== u) {
-                                                                       if (o) {
-                                                                               o += ',';
-                                                                       }
-                                                                       o += js2JSON(i) + ':' + v;
-                                                               }
-                                                       }
-       
-                                                       o = '{' + o + '}';
-                                                       return o;
-       
-                                               } else {
-                                                       return;
-                                               }
-                                       }
-                               }
-                               return 'null';
-       
-                       case 'unknown':
-                       case 'number':
-                               if( isNaN(arg) ) throw "JSON.js encountered NaN in js2JSON()";
-                               return arg;
-       
-                       case 'undefined':
-                       case 'function':
-                               return u;
-       
-                       case 'string':
-                       default:
-                               return '"' + String(arg).replace(/(["\\])/g, '\\$1') + '"';
-               }
-
-}

diff --git a/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js b/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js
index fd9a8d1..7f2de1d 100644 (file)
--- a/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js
+++ b/Open-ILS/src/javascript/backend/libs/jsonopensrfrequest.js
@@ -1,6 +1,6 @@
 try {
        load_lib('jsOO.js');
-       load_lib('JSON.js');
+       load_lib('JSON_v1.js');
 } catch (e) {}
 
 var __jsonopensrfreqid = 1;

diff --git a/Open-ILS/src/javascript/backend/penalty/patron_penalty.js b/Open-ILS/src/javascript/backend/penalty/patron_penalty.js
index f297a57..07ed2ee 100644 (file)
--- a/Open-ILS/src/javascript/backend/penalty/patron_penalty.js
+++ b/Open-ILS/src/javascript/backend/penalty/patron_penalty.js
@@ -2,6 +2,7 @@ function go() {
 
 /* load the lib script */
 load_lib('circ/circ_lib.js');
+load_lib('JSON_v1.js');
 log_vars('patron_penalty');
 
 var config = findGroupConfig(patronProfile);

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/ScriptRunner.pm b/Open-ILS/src/perlmods/OpenILS/Utils/ScriptRunner.pm
index 42353d2..72265f6 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Utils/ScriptRunner.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/ScriptRunner.pm
@@ -7,9 +7,7 @@ use JavaScript::SpiderMonkey;
 use LWP::UserAgent;
 use XML::LibXML;
 use Time::HiRes qw/time/;
-use vars qw/%_paths $__json_js/;
-
-{ local $/ = undef; $__json_js = <DATA>; }
+use vars qw/%_paths/;
 
 sub DESTROY {
        my $self = shift;
@@ -176,7 +174,7 @@ sub run {
 
                if ($_real) {
                        $self->insert('__' => {'OILS_RESULT' => ''});
-                       $js->eval($__json_js."__.OILS_RESULT = js2JSON(environment.result);");
+                       $js->eval("__.OILS_RESULT = js2JSON(environment.result);");
                        $res = $self->retrieve('__.OILS_RESULT');
                }
        }
@@ -599,143 +597,3 @@ sub _JS_DOM {
 
 
 1;
-
-__DATA__
-
-// in case we run on an implimentation that doesn't have "undefined";
-var undefined;
-
-function Cast (obj, class_constructor) {
-       try {
-               if (eval(class_constructor + '["_isfieldmapper"]')) {
-                       obj = eval("new " + class_constructor + "(obj)");
-               }
-       } catch( E ) {
-               alert( E + "\n");
-       } finally {
-               return obj;
-       }
-}
-
-function JSON2js (json) {
-
-       json = String(json).replace( /\/\*--\s*S\w*?\s*?\s+\w+\s*--\*\//g, 'Cast(');
-       json = String(json).replace( /\/\*--\s*E\w*?\s*?\s+(\w+)\s*--\*\//g, ', "$1")');
-
-       var obj;
-       if (json != '') {
-               try {
-                       eval( 'obj = ' + json );
-               } catch(E) {
-                       debug("Error building JSON object with string " + E + "\nString:\n" + json );
-                       return null;
-               }
-       }
-       return obj;
-}
-
-
-function object2Array(obj) {
-       if( obj == null ) return null;
-
-       var arr = new Array();
-       for( var i  = 0; i < obj.length; i++ ) {
-               arr[i] = obj[i];
-       }
-       return arr;
-}
-
-
-function js2JSON(arg) {
-       return _js2JSON(arg);
-}
-
-function _js2JSON(arg) {
-       var i, o, u, v;
-
-               switch (typeof arg) {
-                       case 'object':
-       
-                               if(arg) {
-       
-                                       if (arg._isfieldmapper) { /* magi-c-ast for fieldmapper objects */
-       
-                                               if( arg.a.constructor != Array ) {
-                                                       var arr = new Array();
-                                                       for( var i  = 0; i < arg.a.length; i++ ) {
-                                                               if( arg.a[i] == null ) {
-                                                                       arr[i] = null; continue;
-                                                               }
-       
-                                                               if( typeof arg.a[i] != 'object' ) { 
-                                                                       arr[i] = arg.a[i];
-       
-                                                               } else if( typeof arg.a[i] == 'object' 
-                                                                                       && arg.a[i]._isfieldmapper) {
-       
-                                                                       arr[i] = arg.a[i];
-       
-                                                               } else {
-                                                                       arr[i] = object2Array(arg.a[i]);                
-                                                               }
-                                                       }
-                                                       arg.a = arr;
-                                               }
-       
-                                               return "/*--S " + arg.classname + " --*/" + js2JSON(arg.a) + "/*--E " + arg.classname + " --*/";
-       
-                                       } else {
-       
-                                               if (arg.constructor == Array) {
-                                                       o = '';
-                                                       for (i = 0; i < arg.length; ++i) {
-                                                               v = js2JSON(arg[i]);
-                                                               if (o) {
-                                                                       o += ',';
-                                                               }
-                                                               if (v !== u) {
-                                                                       o += v;
-                                                               } else {
-                                                                       o += 'null';
-                                                               }
-                                                       }
-                                                       return '[' + o + ']';
-       
-                                               } else if (typeof arg.toString != 'undefined') {
-                                                       o = '';
-                                                       for (i in arg) {
-                                                               v = js2JSON(arg[i]);
-                                                               if (v !== u) {
-                                                                       if (o) {
-                                                                               o += ',';
-                                                                       }
-                                                                       o += js2JSON(i) + ':' + v;
-                                                               }
-                                                       }
-       
-                                                       o = '{' + o + '}';
-                                                       return o;
-       
-                                               } else {
-                                                       return;
-                                               }
-                                       }
-                               }
-                               return 'null';
-       
-                       case 'unknown':
-                       case 'number':
-                               if( isNaN(arg) ) throw "JSON.js encountered NaN in js2JSON()";
-                               return arg;
-       
-                       case 'undefined':
-                       case 'function':
-                               return u;
-       
-                       case 'string':
-                       default:
-                               return '"' + String(arg).replace(/(["\\])/g, '\\$1') + '"';
-               }
-
-}
-

diff --git a/Open-ILS/src/reporter/templates/header.ttk b/Open-ILS/src/reporter/templates/header.ttk
index 93ca9c3..8714e0d 100644 (file)
--- a/Open-ILS/src/reporter/templates/header.ttk
+++ b/Open-ILS/src/reporter/templates/header.ttk
@@ -7,7 +7,7 @@
        <script language='javascript' src='/opac/common/js/config.js'> </script>
        <script language='javascript' src='/opac/common/js/utils.js'> </script>
        <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>
-       <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+       <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
        <script language='javascript' src='/opac/common/js/RemoteRequest.js'> </script>
        <script language="javascript" src="/opac/common/js/slimtree.js"></script>
        <script language="javascript">

diff --git a/Open-ILS/web/opac/common/js/JSON.js b/Open-ILS/web/opac/common/js/JSON.js
deleted file mode 100644 (file)
index 5ea4b0a..0000000
--- a/Open-ILS/web/opac/common/js/JSON.js
+++ /dev/null
@@ -1,140 +0,0 @@
-// in case we run on an implimentation that doesn't have "undefined";
-var undefined;
-
-function Cast (obj, class_constructor) {
-       try {
-               if (eval(class_constructor + '["_isfieldmapper"]')) {
-                       obj = eval("new " + class_constructor + "(obj)");
-               }
-       } catch( E ) {
-               alert( E + "\n");
-       } finally {
-               return obj;
-       }
-}
-
-function JSON2js (json) {
-
-       json = String(json).replace( /\/\*--\s*S\w*?\s*?\s+\w+\s*--\*\//g, 'Cast(');
-       json = String(json).replace( /\/\*--\s*E\w*?\s*?\s+(\w+)\s*--\*\//g, ', "$1")');
-
-       var obj;
-       if (json != '') {
-               try {
-                       eval( 'obj = ' + json );
-               } catch(E) {
-                       alert("* Fix Me *\nError parsing JSON [" + E + "]\n\n" + json );
-                       return null;
-               }
-       }
-       return obj;
-}
-
-
-function object2Array(obj) {
-       if( obj == null ) return null;
-       var arr = new Array();
-       for( var i  = 0; i < obj.length; i++ ) 
-               arr[i] = obj[i];
-       return arr;
-}
-
-
-function js2JSON(arg) {
-       return _js2JSON(arg);
-}
-
-function _js2JSON(arg) {
-       var i, o, u, v;
-
-               switch (typeof arg) {
-                       case 'object':
-       
-                               if(arg) {
-       
-                                       if (arg._isfieldmapper) { /* magi-c-ast for fieldmapper objects */
-       
-                                               if( arg.a.constructor != Array ) {
-                                                       var arr = new Array();
-                                                       for( var i  = 0; i < arg.a.length; i++ ) {
-                                                               if( arg.a[i] == null ) {
-                                                                       arr[i] = null; continue;
-                                                               }
-       
-                                                               if( typeof arg.a[i] != 'object' ) { 
-                                                                       arr[i] = arg.a[i];
-       
-                                                               } else if( typeof arg.a[i] == 'object' 
-                                                                                       && arg.a[i]._isfieldmapper) {
-       
-                                                                       arr[i] = arg.a[i];
-       
-                                                               } else {
-                                                                       arr[i] = object2Array(arg.a[i]);                
-                                                               }
-                                                       }
-                                                       arg.a = arr;
-                                               }
-       
-                                               return "/*--S " + arg.classname + " --*/" + js2JSON(arg.a) + "/*--E " + arg.classname + " --*/";
-       
-                                       } else {
-       
-                                               if (arg.constructor == Array) {
-                                                       o = '';
-                                                       for (i = 0; i < arg.length; ++i) {
-                                                               v = js2JSON(arg[i]);
-                                                               if (o) {
-                                                                       o += ',';
-                                                               }
-                                                               if (v !== u) {
-                                                                       o += v;
-                                                               } else {
-                                                                       o += 'null';
-                                                               }
-                                                       }
-                                                       return '[' + o + ']';
-       
-                                               } else if (typeof arg.toString != 'undefined') {
-                                                       o = '';
-                                                       for (i in arg) {
-                                                               v = js2JSON(arg[i]);
-                                                               if (v !== u) {
-                                                                       if (o) {
-                                                                               o += ',';
-                                                                       }
-                                                                       o += js2JSON(i) + ':' + v;
-                                                               }
-                                                       }
-       
-                                                       o = '{' + o + '}';
-                                                       return o;
-       
-                                               } else {
-                                                       return;
-                                               }
-                                       }
-                               }
-                               return 'null';
-       
-                       case 'unknown':
-                       case 'number':
-                               if( isNaN(arg) ) throw "JSON.js encountered NaN in js2JSON()";
-                               return arg;
-       
-                       case 'undefined':
-                       case 'function':
-                               return u;
-       
-                       case 'string':
-                       default:
-                               var s = String(arg);
-                               s = s.replace(/\\/g, '\\\\');
-                               s = s.replace(/"/g, '\\"');
-                               s = s.replace(/\t/g, "\\t");
-                               s = s.replace(/\n/g, "\\n");
-                               s = s.replace(/\r/g, "\\r");
-                               s = s.replace(/\f/g, "\\f");
-                               return '"' + s + '"';
-               }
-}

diff --git a/Open-ILS/xul/staff_client/Makefile b/Open-ILS/xul/staff_client/Makefile
index 1cae976..11f3e00 100644 (file)
--- a/Open-ILS/xul/staff_client/Makefile
+++ b/Open-ILS/xul/staff_client/Makefile
@@ -1,6 +1,7 @@
 # ILS/Open-ILS/xul/staff_client/Makefile
 
 export STAFF_CLIENT_BUILD_ID = $$(/bin/cat build/BUILD_ID)
+export OPENSRF_JSLIBS = $(OPENSRF_LIBS)/javascript
 
 all: build 
        @echo
@@ -59,6 +60,7 @@ open-ils:
        @echo '********************************************************* Grabbing more OPAC code and legacy code and custom code'
        #cp ../../../OpenSRF/src/javascript/*.js build/chrome/content/OpenSRF/
        cp ../../../Open-ILS/web/opac/common/js/*.js build/chrome/content/OpenILS/util/
+       cp $(OPENSRF_JSLIBS)/*.js build/chrome/content/OpenILS/util/
        #cp ../../../Evergreen/staff_client/chrome/content/evergreen/cat/marc* build/chrome/content/legacy/
        #cp ../../../Evergreen/staff_client/chrome/content/evergreen/cat/browse* build/chrome/content/legacy/
        #cp ../../../Evergreen/staff_client/chrome/locale/en-US/evergreen/cat.dtd build/chrome/locale/en-US/

diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index 988eb47..bc92d5a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -11,7 +11,7 @@
                <script type="text/javascript" src="/opac/common/js/utils.js" />
                <script type="text/javascript" src="/opac/common/js/CGI.js" />
                <script type="text/javascript" src="/opac/common/js/md5.js" />
-               <script type="text/javascript" src="/opac/common/js/JSON.js" />
+               <script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
                <script type="text/javascript" src="/opac/common/js/fmall.js" />
                <script type="text/javascript" src="/opac/common/js/fmgen.js" />
                <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />

diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
index 483b62b..8fbb556 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -8,7 +8,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index 9bcc842..ec96cc6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -8,7 +8,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
index 133c995..207eb20 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
@@ -8,7 +8,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
index b721330..082af82 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
@@ -16,7 +16,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
index d10133c..48fd2d3 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml
@@ -16,7 +16,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
index 5e53675..4e3c64c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml
@@ -8,7 +8,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/org_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_settings.xhtml
index aefbf54..19cb0ed 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/org_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_settings.xhtml
@@ -8,7 +8,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
index fdb05b3..9c559f2 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html
@@ -3,7 +3,7 @@
        <script type="text/javascript" src="/opac/common/js/utils.js"></script>
        <script type="text/javascript" src="/opac/common/js/CGI.js"></script>
        <script type="text/javascript" src="/opac/common/js/md5.js"></script>
-       <script type="text/javascript" src="/opac/common/js/JSON.js"></script>
+       <script type="text/javascript" src="/opac/common/js/JSON_v1.js"></script>
        <script type="text/javascript" src="/opac/common/js/fmall.js"></script>
        <script type="text/javascript" src="/opac/common/js/fmgen.js"></script>
        <script type="text/javascript" src="/opac/common/js/RemoteRequest.js"></script>

diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
index b4be986..d84f22d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml
@@ -8,7 +8,7 @@
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
index d3c13f8..c0f553e 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/upload_xacts.xhtml
@@ -19,7 +19,7 @@
        <script type="text/javascript" src="/opac/common/js/utils.js" />
        <script type="text/javascript" src="/opac/common/js/CGI.js" />
        <script type="text/javascript" src="/opac/common/js/md5.js" />
-       <script type="text/javascript" src="/opac/common/js/JSON.js" />
+       <script type="text/javascript" src="/opac/common/js/JSON_v1.js" />
        <script type="text/javascript" src="/opac/common/js/fmall.js" />
        <script type="text/javascript" src="/opac/common/js/fmgen.js" />
        <script type="text/javascript" src="/opac/common/js/RemoteRequest.js" />

diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index d896766..bd455f4 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -17,7 +17,7 @@
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
                <script language='javascript' src='/opac/common/js/slimtree.js'> </script>
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xml b/Open-ILS/xul/staff_client/server/patron/user_edit.xml
index f06d5cf..2b5411f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xml
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xml
@@ -9,7 +9,7 @@
                 <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
 
                 <script language='javascript' src='/opac/common/js/slimtree.js'> </script>
-                <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+                <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                 <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                 <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                 <script language='javascript' src='/opac/common/js/opac_utils.js'> </script>

diff --git a/Open-ILS/xul/staff_client/server/patron/user_editor.xhtml b/Open-ILS/xul/staff_client/server/patron/user_editor.xhtml
index 50dfc7e..5dd2409 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/user_editor.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/user_editor.xhtml
@@ -17,7 +17,7 @@
                <script language='javascript' src='/opac/common/js/Cookie.js'> </script>
        
                <script language='javascript' src='/opac/common/js/slimtree.js'> </script>
-               <script language='javascript' src='/opac/common/js/JSON.js'> </script>
+               <script language='javascript' src='/opac/common/js/JSON_v1.js'> </script>
                <script language='javascript' src='/opac/common/js/fmall.js'> </script>
                <script language='javascript' src='/opac/common/js/fmgen.js'> </script>
                <script language='javascript' src='/opac/common/js/Cookies.js'> </script>