Changeset 1493

Timestamp:

08/22/11 20:19:26 (13 years ago)

Author:

gaba

Message:

pazpar timeout clientside

Location:

MDService2/trunk/MDService2/WebContent/scripts

Files:

• mdservice_model.js (modified) (5 diffs)
• mdservice_pz2.js (modified) (3 diffs)

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -117 +117 @@
         return reptype;
 };
+
+Workspace.prototype.getOption = function(opt_key){
+        var value = "";
+        
+        value = workspace.server_json["WorkspaceProfile"]["Options"][opt_key];
+        
+        return value;
+}
 
 Workspace.prototype.removeelement = function(type, id1, id2){
@@ -237 +245 @@
         } );
 };
-Query.prototype.pazpar2show = function(data){
+Query.prototype.pazpar2show = function(data, activeClients){
         //this.container.find('.result').html(data);
         
@@ -261 +269 @@
         
         
-        if (Number( $(data).find(".activeclients").text() ) == 0) {
-        //if (data.activeclients == 0){
+        //if (Number( $(data).find(".activeclients").text() ) == 0) {
+        if (activeClients == 0){
                 // update link-hrefs
                 var qid = $(res).closest('.query_wrapper').attr("id");
@@ -831 +839 @@
                 var reptype = workspace.getRepositoryType(this.repository);
                 
+                // USE CLIENT PAZPAR
                 if (reptype=="pazpar"){
                         //pazpar handling this
@@ -843 +852 @@
                                 uri = link('sru', this.format, this.sruquery_uri());
                         } else {
-                                
+                                // USE SERVER PAZPAR 
                                 //if (reptype=="pazpar"){
                                 //      uri = link('pazpar', this.format, this.query_uri());

MDService2/trunk/MDService2/WebContent/scripts/mdservice_pz2.js

@@ -95 +95 @@
     this.recordCounter = 0;
 
+    this.showStartTime = 0;
+    this.showTimeout = workspace.getOption("pazpartimeout");
     // active clients, updated by stat and show
     // might be an issue since bytarget will poll accordingly
@@ -237 +239 @@
                                                      context.searchStatusOK = true;
                                                      //piggyback search
+                                                             var d = new Date();
+                                                     context.showStartTime = d.getTime();
                                                      context.show(start, num, sort);
                                                      if ( context.statCallback )
@@ -336 +340 @@
                     
                     context.showCounter++;
-                    var delay = context.showTime;
-                    if (context.showCounter > context.showFastCount)
+                    var delay = context.showTime;
+                    var d = new Date();
+                    var currentTime = d.getTime();
+                    if (context.showCounter > context.showFastCount)
                             delay += context.showCounter * context.dumpFactor;
-                    if ( activeClients > 0 ){
-                        context.showTimer = setTimeout(
-                            function () {
-                                context.show();
-                            }, 
-                            delay);
-                    }
+                   
+                                if ((currentTime - context.showStartTime)/1000 > context.showTimeout){
+                                        //$(tempdata).find(".activeclients").html('0');
+                                        //$(tempdata).find(".activeclients")[0].textContent = '0';
+                                        activeClients = 0;
+                                } 
+                        if ( activeClients > 0 ){
+                                context.showTimer = setTimeout(
+                                    function () {
+                                        context.show();
+                                    }, 
+                                    delay);
+                            }
                     global_show = $(data);//show;
-                    context.showCallback($(data));
+                    context.showCallback($(data), activeClients);
                 }
                 else