use cached request

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

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 29d143d..c510de1 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -232,7 +232,7 @@ circ.checkout.prototype = {
 
                this.check_disable();
 
-               var robj = obj.network.simple_request(
+               var robj = obj.network.cached_request(
                        'FM_CIRC_COUNT_RETRIEVE_VIA_USER',
                        [ ses(), obj.patron_id ]
                );

diff --git a/Open-ILS/xul/staff_client/server/patron/summary.js b/Open-ILS/xul/staff_client/server/patron/summary.js
index 2b6a5c5..15b3778 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary.js
+++ b/Open-ILS/xul/staff_client/server/patron/summary.js
@@ -127,7 +127,7 @@ patron.summary.prototype = {
                                                function(e) {
                                                        return function() { 
                                                                e.setAttribute('value','...');
-                                                               obj.network.simple_request(
+                                                               obj.network.cached_request(
                                                                        'FM_MOUS_RETRIEVE',
                                                                        [ ses(), obj.patron.id() ],
                                                                        function(req) {
@@ -171,16 +171,20 @@ patron.summary.prototype = {
                                                                var e4 = document.getElementById( 'patron_long_overdue' ); if (e4) e4.setAttribute('value','...');
                                                                var e5 = document.getElementById( 'patron_lost' ); if (e5) e5.setAttribute('value','...');
                                                                var e6 = document.getElementById( 'patron_noncat' ); if (e6) e6.setAttribute('value','...');
-                                                               obj.network.simple_request(
+                                                               obj.network.cached_request(
                                                                        'FM_CIRC_COUNT_RETRIEVE_VIA_USER',
                                                                        [ ses(), obj.patron.id() ],
                                                                        function(req) {
-                                                                               var robj = req.getResultObject();
-                                                                               e.setAttribute('value', robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
-                                                                               if (e2) e2.setAttribute('value', robj.overdue   );
-                                                                               if (e3) e3.setAttribute('value', robj.claims_returned   );
-                                                                               if (e4) e4.setAttribute('value', robj.long_overdue      );
-                                                                               if (e5) e5.setAttribute('value', robj.lost      );
+                                                                               try {
+                                                                                       var robj = req.getResultObject();
+                                                                                       e.setAttribute('value', robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
+                                                                                       if (e2) e2.setAttribute('value', robj.overdue   );
+                                                                                       if (e3) e3.setAttribute('value', robj.claims_returned   );
+                                                                                       if (e4) e4.setAttribute('value', robj.long_overdue      );
+                                                                                       if (e5) e5.setAttribute('value', robj.lost      );
+                                                                               } catch(E) {
+                                                                                       alert(E);
+                                                                               }
                                                                        }
                                                                );
                                                                obj.network.simple_request(
@@ -567,9 +571,8 @@ patron.summary.prototype = {
                                        try {
                                                var robj;
                                                if (obj.barcode && obj.barcode != 'null') {
-                                                       robj = obj.network.request(
-                                                               api.FM_AU_RETRIEVE_VIA_BARCODE.app,
-                                                               api.FM_AU_RETRIEVE_VIA_BARCODE.method,
+                                                       robj = obj.network.simple_request(
+                                                               'FM_AU_RETRIEVE_VIA_BARCODE',
                                                                [ ses(), obj.barcode ]
                                                        );
                                                } else if (obj.id && obj.id != 'null') {

diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js
index 4f5fd41..6165fce 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/util.js
+++ b/Open-ILS/xul/staff_client/server/patron/util.js
@@ -472,9 +472,8 @@ patron.util.std_map_row_to_columns = function(error_value) {
 patron.util.retrieve_au_via_id = function(session, id, f) {
        JSAN.use('util.network');
        var network = new util.network();
-       var patron_obj = network.request(
-               api.FM_AU_RETRIEVE_VIA_ID.app,
-               api.FM_AU_RETRIEVE_VIA_ID.method,
+       var patron_obj = network.cached_request(
+               'FM_AU_RETRIEVE_VIA_ID',
                [ session, id ],
                f
        );
@@ -484,7 +483,7 @@ patron.util.retrieve_au_via_id = function(session, id, f) {
 patron.util.retrieve_name_via_id = function(session, id) {
        JSAN.use('util.network');
        var network = new util.network();
-       var parts = network.simple_request(
+       var parts = network.cached_request(
                'BLOB_AU_PARTS_RETRIEVE',
                [ session, id, ['family_name', 'first_given_name', 'second_given_name', 'home_ou' ] ]
        );
@@ -494,7 +493,7 @@ patron.util.retrieve_name_via_id = function(session, id) {
 patron.util.retrieve_fleshed_au_via_id = function(session, id) {
        JSAN.use('util.network');
        var network = new util.network();
-       var patron_obj = network.simple_request(
+       var patron_obj = network.cached_request(
                'FM_AU_FLESHED_RETRIEVE_VIA_ID',
                [ session, id ]
        );
@@ -505,7 +504,7 @@ patron.util.retrieve_fleshed_au_via_id = function(session, id) {
 patron.util.retrieve_fleshed_au_via_barcode = function(session, id) {
        JSAN.use('util.network');
        var network = new util.network();
-       var patron_obj = network.simple_request(
+       var patron_obj = network.cached_request(
                'FM_AU_RETRIEVE_VIA_BARCODE',
                [ session, id ]
        );
@@ -547,14 +546,18 @@ patron.util.set_penalty_css = function(patron) {
                                                        removeCSSClass(document.documentElement,'PATRON_NET_ACCESS_3');
 
                JSAN.use('util.network'); var net = new util.network();
-               net.simple_request('FM_MOUS_RETRIEVE',[ ses(), patron.id() ], function(req) {
+               net.cached_request('FM_MOUS_RETRIEVE',[ ses(), patron.id() ], function(req) {
                        if (req.getResultObject().balance_owed() > 0) addCSSClass(document.documentElement,'PATRON_HAS_BILLS');
                });
-               net.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_USER',[ ses(), patron.id() ], function(req) {
-                       var co = req.getResultObject();
-                       if (co.overdue > 0 || co.long_overdue > 0) addCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
+               net.cached_request('FM_CIRC_COUNT_RETRIEVE_VIA_USER',[ ses(), patron.id() ], function(req) {
+                       try {
+                               var co = req.getResultObject();
+                               if (co.overdue > 0 || co.long_overdue > 0) addCSSClass(document.documentElement,'PATRON_HAS_OVERDUES');
+                       } catch(E) {
+                               alert(E);
+                       }
                });
-               net.simple_request('FM_AUN_RETRIEVE_ALL',[ ses(), { 'patronid' : patron.id() } ], function(req) {
+               net.cached_request('FM_AUN_RETRIEVE_ALL',[ ses(), { 'patronid' : patron.id() } ], function(req) {
                        var notes = req.getResultObject();
                        if (notes.length > 0) addCSSClass(document.documentElement,'PATRON_HAS_NOTES');
                });