From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Sat, 30 Mar 2013 06:59:00 +0000 (-0700)
Subject: Adds polling for record command (WiP)
X-Git-Tag: v0.0.7~194
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=12b951baa959d50bbf0b81671c8c4a5a6f2852ee;p=mkjsf-moved-to-github.git

Adds polling for record command (WiP)
---

diff --git a/src/META-INF/resources/pz2utils/fieldlisteners.js b/src/META-INF/resources/pz2utils/fieldlisteners.js
index 5f521f0..300d223 100644
--- a/src/META-INF/resources/pz2utils/fieldlisteners.js
+++ b/src/META-INF/resources/pz2utils/fieldlisteners.js
@@ -1,4 +1,5 @@
   var renderTargetsReqVar;
+  var renderOnRecordTargetsReqVar;
     
   function renderTargets(doRefresh)
   {
@@ -17,6 +18,26 @@
     	//console.log("No further updates from server requested");
     }
   }
+  
+  function renderOnRecordTargets(doRefresh)
+  {
+	console.log('rendering ' + renderWhileActiveclientsRecord);
+	var sourcecomp = document.getElementById("pz2watch:activeclientsFieldRecord");
+    jsf.ajax.request(sourcecomp, null,{render: renderWhileActiveclientsRecord});
+    if (doRefresh) {
+		console.log('Will do another ajax request after a timeout in order to render: pz2watch:activeclientsFieldRecord');  
+	    renderOnRecordTargetsReqVar=setTimeout(
+	     function() {              
+	       console.log('Making request for pz2watch:activeclientsFieldRecord');
+	       jsf.ajax.request(sourcecomp, null,{render: "pz2watch:activeclientsFieldRecord"});       
+	     }
+	     ,2000);
+    } else {
+    	console.log("No further updates from server requested");
+    	jsf.ajax.request(sourcecomp, null,{render: renderWhileActiveclientsRecord});
+    }
+  }
+
 
   function windowlocationhashListener () {
 	  if (trackHistory) {
@@ -85,6 +106,22 @@
       }
 	};
   };
+  
+  var ActiveclientsRecordListener = function () {
+	    this.invoke = function (field) {
+	      var updateDoc = StringtoXML(field.textContent || field.text);
+	      var activeClientsRecordValue = (updateDoc.childNodes[0].textContent || updateDoc.childNodes[0].text);
+	      console.log('Activeclients response for record detected: ' + activeClientsRecordValue);
+	      clearTimeout(renderOnRecordTargetsReqVar);
+	      if (activeClientsRecordValue > '0') {
+	        renderOnRecordTargets(true);
+	      } else {
+	    	console.log('Active clients is 0, final rendering');
+	    	renderOnRecordTargets(false);
+	      }
+		};
+	  };
+
     
   jsf.ajax.addOnEvent(fieldUpdateListener);
   
@@ -104,6 +141,7 @@
   var setUpListeners = function () {
     //console.log("Starts tracking activeclientsField");
     fieldListeners.addListener("pz2watch:activeclientsField", new ActiveclientsListener());
+    fieldListeners.addListener("pz2watch:activeclientsFieldRecord", new ActiveclientsRecordListener());
     if (trackHistory) {
         //console.log("Starts tracking windowlocationhash field");
         fieldListeners.addListener("pz2watch:windowlocationhash", new StateListener());
diff --git a/src/META-INF/resources/pz2utils/pz2watch.xhtml b/src/META-INF/resources/pz2utils/pz2watch.xhtml
index 9cbdda2..39706dd 100644
--- a/src/META-INF/resources/pz2utils/pz2watch.xhtml
+++ b/src/META-INF/resources/pz2utils/pz2watch.xhtml
@@ -13,6 +13,7 @@
 
   <cc:interface>
     <cc:attribute name="renderWhileActiveclients"/>
+    <cc:attribute name="renderWhileActiveclientsRecord"/>
     <cc:attribute name="trackHistory"/>
     <cc:attribute name="renderOnHitoryChange"/> 
     <cc:attribute name="debug"/>   
@@ -26,6 +27,7 @@
     <script>
      //<![CDATA[
        var renderWhileActiveclients = "${cc.attrs.renderWhileActiveclients}";
+       var renderWhileActiveclientsRecord = "${cc.attrs.renderWhileActiveclientsRecord}";
        var renderOnHistoryChange = "${cc.attrs.renderOnHistoryChange}";
        var trackHistory = ("${cc.attrs.trackHistory}" == "true");  
        setUpListeners();
@@ -35,6 +37,8 @@
     <h:form id="activeclientsForm" prependId="false">
       <h:outputText id="activeClientsLabel" value="Active clients: " style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/> 
       <h:outputText id="activeclientsField" value="${pz2.update()}"  style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/>
+      <h:outputText id="activeclientsFieldRecord" value="${pz2.update('record')}" style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/>
+      
       <h:panelGrid id="errorMessages" style="${pz2.hasErrors() ? 'display: block;' : 'display: none;'}">
         <h:dataTable value="#{pz2.configurationErrors}" var="error" cellspace="0" cellpadding="0" style="${pz2.hasConfigurationErrors() ? 'display: block; vertical-align: top;' : 'display: none;'}">
           <h:column valign="top">
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index e0b7ea7..a4b1b68 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -126,7 +126,12 @@ public class Pz2Session implements Pz2Interface {
            Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);
            dataObjects.put(commandName, responseObject);        
         }
-        return getActiveClients();
+        if (commands.equals("record")) {
+          logger.debug("Record: Active clients: "+getRecord().getActiveClients());
+          return getRecord().getActiveClients();
+        } else {
+          return getActiveClients();
+        }  
       } else {
         logger.debug("Skipped requests for " + commands + " as there's not yet a query."); 
         resetDataObjects();
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/RecordResponse.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/RecordResponse.java
index d1af720..1667c1f 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/RecordResponse.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/RecordResponse.java
@@ -55,5 +55,9 @@ public class RecordResponse extends Pazpar2ResponseData {
     return getLocations().size()>0 ? getLocations().get(0) : null;
   }
   
+  public String getActiveClients () {
+    return getOneElementValue("activeclients");
+  }
+
   
 }
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pz2utils/ListenerFieldIds.java b/src/main/java/com/indexdata/pz2utils4jsf/pz2utils/ListenerFieldIds.java
index 4315d82..a454936 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pz2utils/ListenerFieldIds.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pz2utils/ListenerFieldIds.java
@@ -19,6 +19,10 @@ public class ListenerFieldIds implements Serializable {
     return ":pz2watch:activeclientsForm:activeclientsField";
   }
   
+  public String getActiveclientsRecord () {
+    return ":pz2watch:activeclientsForm:activeclientsFieldRecord";
+  }
+  
   public String getErrorMessages () {
     return ":pz2watch:activeclientsForm:errorMessages";
   }