From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 29 Oct 2014 21:09:35 +0000 (-0400)
Subject: Holding_Maintenance Attempts to fix refresh issue on pgpooled dbs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c1e215c60706e9aea6dbba02dfd2369398fac249;p=working%2FEvergreen.git

Holding_Maintenance Attempts to fix refresh issue on pgpooled dbs

    Cross-port: 231f1bb

Conflicts:
	Open-ILS/xul/staff_client/server/cat/copy_browser.js
---

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 2a95865f20..eeda8a5d93 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -153,6 +153,7 @@ cat.util.transfer_copies = function(params) {
     JSAN.use('util.error'); var error = new util.error();
     JSAN.use('OpenILS.data'); var data = new OpenILS.data();
     JSAN.use('util.network'); var network = new util.network();
+    JSAN.use('cat.util');
     try {
         data.stash_retrieve();
         if (!data.marked_volume) {
@@ -209,8 +210,10 @@ cat.util.transfer_copies = function(params) {
         } else {
             alert($("catStrings").getString('staff.cat.util.transfer_copies.successful_transfer'));
         }
-        
-        return network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ params.copy_ids ]);;
+
+        cat.util.pauseComp(1000);
+
+        return network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ params.copy_ids ]);
 
     } catch(E) {
         error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.util.transfer_copies.transfer_error'),E);
@@ -371,6 +374,7 @@ cat.util.mark_item_damaged = function(copy_ids) {
         JSAN.use('util.error'); error = new util.error();
         JSAN.use('util.functional'); JSAN.use('util.date');
         JSAN.use('util.network'); var network = new util.network();
+        JSAN.use('cat.util');
         if (!copy_ids) { return; }
         copy_ids = util.functional.filter_list( copy_ids, function(o) { return o != null; } );
         if (copy_ids.length < 1) { return; }
@@ -519,6 +523,8 @@ cat.util.mark_item_damaged = function(copy_ids) {
                     $("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.multiple_item_damaged', [count]));
             }
         }
+
+        cat.util.pauseComp(1000);
         
         return network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ copy_ids ]);
 
@@ -534,6 +540,7 @@ cat.util.mark_item_missing = function(copy_ids) {
         JSAN.use('util.error'); error = new util.error();
         JSAN.use('util.functional');
         JSAN.use('util.network'); var network = new util.network();
+        JSAN.use('cat.util');
         if (!copy_ids) { return; }
         copy_ids = util.functional.filter_list( copy_ids, function(o) { return o != null; } );
         if (copy_ids.length < 1) { return; }
@@ -575,7 +582,9 @@ cat.util.mark_item_missing = function(copy_ids) {
                     $("catStrings").getFormattedString('staff.cat.util.mark_item_missing.multiple_item_missing', [count]));
             }
         }
-        
+
+        cat.util.pauseComp(1000);
+
         return network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ copy_ids ]);
 
     } catch(E) {
@@ -859,6 +868,7 @@ cat.util.mark_item_as_missing_pieces = function(copy_ids) {
         JSAN.use('util.network'); var network = new util.network();
         JSAN.use('util.print'); var print = new util.print('receipt');
         JSAN.use('util.window'); var win = new util.window();
+        JSAN.use('cat.util');
         if (!copy_ids) { return; }
         copy_ids = util.functional.filter_list( copy_ids, function(o) { return o != null; } );
         if (copy_ids.length < 1) { return; }
@@ -873,7 +883,6 @@ cat.util.mark_item_as_missing_pieces = function(copy_ids) {
 
         if (r == 0) {
             var count = 0;
-            JSAN.use('cat.util');
             for (var i = 0; i < copies.length; i++) {
                 try {
                     var robj = network.simple_request('MARK_ITEM_MISSING_PIECES',[ses(),copies[i].id()]);
@@ -946,10 +955,10 @@ cat.util.mark_item_as_missing_pieces = function(copy_ids) {
                     error.standard_unexpected_error_alert($("catStrings").getFormattedString('staff.cat.util.mark_item_missing_pieces.marking_error', [copies[i].barcode()]),E);
                 }
             }
-            /*alert(count == 1 ? $("catStrings").getString('staff.cat.util.mark_item_missing_pieces.one_item_missing_pieces') :
-                $("catStrings").getFormattedString('staff.cat.util.mark_item_missing_pieces.multiple_item_missing_pieces', [count]));*/
         }
 
+        cat.util.pauseComp(1000);
+
         return network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ copy_ids ]);
     } catch(E) {
         alert('Error in cat.util.mark_item_as_missing_pieces: ' + E);
@@ -1161,22 +1170,29 @@ cat.util.update_copies_by_id = function(copy_ids) {
         JSAN.use('util.error'); error = new util.error();
         JSAN.use('util.functional');
         JSAN.use('util.network'); var network = new util.network();
+        JSAN.use('cat.util');
         if (!copy_ids) { return; }
         copy_ids = util.functional.filter_list( copy_ids, function(o) { return o != null; } );
         if (copy_ids.length < 1) { return; }
         
         if(typeof copy_ids[0] == "object"){
-			
-			return copy_ids;
-		}
-		
-		else{
-			
-			var copies = network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ copy_ids ]);
-			if (typeof copies.ilsevent != 'undefined') throw(copies);
 
-			return copies;
-		}
+            for (var c in copy_ids){
+
+                if(typeof copy_ids[c] == "object"){
+
+                    copy_ids[c] = copy_ids[c].id();
+                }
+            }
+        }
+
+		cat.util.pauseComp(1000);
+
+		var copies = network.simple_request('FM_ACP_UNFLESHED_BATCH_RETRIEVE', [ copy_ids ]);
+		if (typeof copies.ilsevent != 'undefined') throw(copies);
+
+		return copies;
+
     } catch(E) {
         if (error) error.standard_unexpected_error_alert('cat.util.update_copies_by_id',E); else alert('FIXME: ' + E);
         return null;
@@ -1363,4 +1379,12 @@ cat.util.get_cbs_for_bre_id = function(doc_id) {
     }
 }
 
+cat.util.pauseComp = function(ms) {
+    var curr = new Date().getTime();
+    ms += curr;
+    while (curr < ms){
+        curr = new Date().getTime();
+    }
+}
+
 dump('exiting cat/util.js\n');