From be532cf4928f497e5e718d78959dfff4039c01b9 Mon Sep 17 00:00:00 2001
From: "Niels Erik G. Nielsen" <nielserik@indexdata.com>
Date: Sun, 14 Apr 2013 00:51:32 -0400
Subject: [PATCH] Moves response objects from pz2 bean to dedicated bean

... like commands were factored out of the main bean, so are
response data objects now

... this commit also drops the distinction between bean and session,
    all session methods (that are not commands or response methods)
    moved to the bean and the session object dropped
---
 src/META-INF/resources/pz2utils/pz2watch.xhtml     |    4 +-
 src/META-INF/resources/pz2widgets/pager.xhtml      |    2 +-
 .../pz2utils4jsf/controls/ResultsPager.java        |   31 +-
 .../pz2utils4jsf/pazpar2/ForStraightPz2.java       |   15 -
 .../indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java    |  318 +++++++++------
 .../indexdata/pz2utils4jsf/pazpar2/Pz2Client.java  |    4 -
 .../pz2utils4jsf/pazpar2/Pz2Interface.java         |   78 +---
 .../pz2utils4jsf/pazpar2/Pz2ProxyBean.java         |  114 +++---
 .../indexdata/pz2utils4jsf/pazpar2/Pz2Session.java |  420 --------------------
 .../pazpar2/commands/Pazpar2Command.java           |    7 +-
 .../pazpar2/data/Pazpar2Responses.java             |  123 ++++++
 .../pz2utils4jsf/pazpar2/sp/ForServiceProxy.java   |   15 -
 .../pazpar2/sp/ServiceProxyClient.java             |   10 +-
 .../pazpar2/sp/ServiceProxySession.java            |  100 -----
 14 files changed, 396 insertions(+), 845 deletions(-)
 delete mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForStraightPz2.java
 delete mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
 create mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/Pazpar2Responses.java
 delete mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java
 delete mode 100644 src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java

diff --git a/src/META-INF/resources/pz2utils/pz2watch.xhtml b/src/META-INF/resources/pz2utils/pz2watch.xhtml
index fbdd66d..da88ba6 100644
--- a/src/META-INF/resources/pz2utils/pz2watch.xhtml
+++ b/src/META-INF/resources/pz2utils/pz2watch.xhtml
@@ -52,9 +52,9 @@
         </h:dataTable>
         <h:panelGrid  style="${pz2.hasCommandErrors() ? 'display: block;' : 'display: none;'}">
           <h:column>
-            <h:outputText id="messages" value="#{pz2.commandError.message}" style="color: red;"/>
+            <h:outputText id="messages" value="#{data.commandError.message}" style="color: red;"/>
           </h:column>
-          <h:dataTable value="#{pz2.commandError.suggestions}" var="suggestion" cellspacing="0" cellpadding="0">                  
+          <h:dataTable value="#{data.commandError.suggestions}" var="suggestion" cellspacing="0" cellpadding="0">                  
            <h:column>
              #{suggestion}        
            </h:column>      
diff --git a/src/META-INF/resources/pz2widgets/pager.xhtml b/src/META-INF/resources/pz2widgets/pager.xhtml
index 3d7a8d2..013b60e 100644
--- a/src/META-INF/resources/pz2widgets/pager.xhtml
+++ b/src/META-INF/resources/pz2widgets/pager.xhtml
@@ -24,7 +24,7 @@
   
   <composite:implementation>
 
-    <h:panelGrid columns="1" width="100%" rendered="#{pz2.hasRecords()}"><h:panelGroup>
+    <h:panelGrid columns="1" width="100%" rendered="#{data.hasRecords()}"><h:panelGroup>
       <h:outputText id="instantiatePager" value="#{pz2.setPager(cc.attrs.visiblePageRange)}" style="display: none;" />
                  
       <h:commandLink value="#{cc.attrs.prevLabel}" 
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/controls/ResultsPager.java b/src/main/java/com/indexdata/pz2utils4jsf/controls/ResultsPager.java
index d7dbf86..e80e1b6 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/controls/ResultsPager.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/controls/ResultsPager.java
@@ -4,42 +4,40 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.indexdata.pz2utils4jsf.controls.PageLink;
-import com.indexdata.pz2utils4jsf.pazpar2.Pz2Session;
 import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Commands;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2Responses;
 
 public class ResultsPager implements Serializable {
 
   private static final long serialVersionUID = 8854795222615583071L;
-  private Pz2Session pz2session = null;
+  private Pazpar2Responses data = null;
   private int pageRangeLength = 13;
   private Pazpar2Commands req;
   
-  public ResultsPager(Pz2Session session) {
-    this.pz2session = session;     
+  public ResultsPager(Pazpar2Responses data) {
+    this.data = data;     
   }
   
-  public ResultsPager(Pz2Session session, int pageRange, Pazpar2Commands req) {
-    this.pz2session = session;
+  public ResultsPager(Pazpar2Responses data, int pageRange, Pazpar2Commands req) {
+    this.data = data;
     this.pageRangeLength = pageRange;
     this.req = req;
   }
   
   private boolean hasHits () {
-    return (getShow().getMerged()>0);
+    return (data.getShow().getMerged()>0);
   }
   
   public int getCurrentPageNum () {
-    if (hasHits() && getShow().getNum()>0) {      
-      return (getShow().getStart()/getShow().getNum())+1;
+    if (hasHits() && data.getShow().getNum()>0) {      
+      return (data.getShow().getStart()/data.getShow().getNum())+1;
     } else {
       return 0;
     }
   }
   
   public int getPageSize() {
-    return getShow().getNum();
+    return data.getShow().getNum();
   }
     
   public int getFirstDisplayedPageNum () {
@@ -68,7 +66,7 @@ public class ResultsPager implements Serializable {
   
   public int getLastPageNum () {
     if (hasHits()) {
-      return (int) Math.ceil(new Double(getShow().getMerged())/new Double(getShow().getNum()));
+      return (int) Math.ceil(new Double(data.getShow().getMerged())/new Double(data.getShow().getNum()));
     } else {
       return 0;
     }
@@ -109,7 +107,7 @@ public class ResultsPager implements Serializable {
   }
   
   public int getCurrentPage() {
-    return (getShow().getStart()/getPageSize()+1);
+    return (data.getShow().getStart()/getPageSize()+1);
   }
   
   public void goToPage(int page) {    
@@ -139,10 +137,5 @@ public class ResultsPager implements Serializable {
   public boolean hasPageAfterLastDisplayed() {
     return getLastDisplayedPageNum() < getLastPageNum();
   }
-
-  
-  private ShowResponse getShow() {
-    return pz2session.getShow();
-  }
     
 }
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForStraightPz2.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForStraightPz2.java
deleted file mode 100644
index 4132c3b..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/ForStraightPz2.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
-public @interface ForStraightPz2 {
-
-}
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index 845f3d9..d942a4a 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -1,7 +1,9 @@
 package com.indexdata.pz2utils4jsf.pazpar2;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.StringTokenizer;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
@@ -13,189 +15,247 @@ import org.apache.log4j.Logger;
 
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;
+import com.indexdata.pz2utils4jsf.errors.ConfigurationError;
+import com.indexdata.pz2utils4jsf.errors.ConfigurationException;
+import com.indexdata.pz2utils4jsf.errors.ErrorHelper;
 import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;
+import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Commands;
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseData;
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseParser;
+import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2Responses;
 import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;
+import com.indexdata.pz2utils4jsf.pazpar2.state.StateListener;
+import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;
 import com.indexdata.pz2utils4jsf.utils.Utils;
 
 @Named("pz2") @SessionScoped @Alternative
-public class Pz2Bean implements Pz2Interface, Serializable {
+public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
 
   private static final long serialVersionUID = 3440277287081557861L;
   private static Logger logger = Logger.getLogger(Pz2Bean.class);
   
-  @Inject ConfigurationReader configurator;
+  protected SearchClient searchClient = null;
   
-  @Inject @ForStraightPz2 Pz2Session pz2;  
+  @Inject ConfigurationReader configurator;
+  @Inject StateManager stateMgr;
+  @Inject Pazpar2Commands req;
+  @Inject Pazpar2Responses data;
   
-  protected SearchClient searchClient;  
-    
+  protected ResultsPager pager = null; 
+
+  protected List<ErrorInterface> configurationErrors = null;
+  protected ErrorHelper errorHelper = null;
+              
   public Pz2Bean () {
-    logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");
+    logger.info("Instantiating pz2 bean [" + Utils.objectId(this) + "]");    
   }
   
   @PostConstruct
-  public void instantiatePz2SessionObject() {    
+  public void postConstruct() {    
     logger.debug("in start of Pz2Bean post-construct configurator is " + configurator);
     logger.debug(Utils.objectId(this) + " will instantiate a Pz2Client next.");
     searchClient = new Pz2Client();
     logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
-                          + Utils.objectId(configurator) + "] on session [" 
-                          + Utils.objectId(pz2) + "]" );    
-    pz2.configureClient(searchClient,configurator);    
+                          + Utils.objectId(configurator) + "]" );    
+    configureClient(searchClient,configurator);
+    stateMgr.addStateListener(this);
   }  
   
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch(java.lang.String)
-   */
-  public void doSearch(String query) {    
-    pz2.doSearch(query);
+  public void configureClient(SearchClient searchClient, ConfigurationReader configReader) {
+    configurationErrors = new ArrayList<ErrorInterface>();
+    errorHelper = new ErrorHelper(configReader);    
+    logger.debug(Utils.objectId(this) + " will configure search client for the session");
+    try {
+      searchClient.configure(configReader);            
+      // At the time of writing this search client is injected using Weld. 
+      // However, the client is used for asynchronously sending off requests
+      // to the server AND propagation of context to threads is currently 
+      // not supported. Trying to do so throws a WELD-001303 error. 
+      // To avoid that, a context free client is cloned from the context 
+      // dependent one. 
+      // If propagation to threads gets supported, the cloning can go.
+      //
+      // Commented as I'm trying with regular instantiation instead
+      // this.searchClient = searchClient.cloneMe();         
+    } catch (ConfigurationException e) {
+      configurationErrors.add(new ConfigurationError("Search Client","Configuration",e.getMessage(),new ErrorHelper(configReader)));          
+    } 
+    logger.info(configReader.document());
+    data.reset();    
   }
 
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#doSearch()
-   */
-  public void doSearch() {
-    logger.info(Utils.objectId(this) + " doing search for "+pz2.getCommandReadOnly("search").getParameterValue("query"));
-    pz2.doSearch();
+    
+  public void doSearch(String query) {
+    req.getSearch().setParameter(new CommandParameter("query","=",query));     
+    doSearch();
   }
 
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#update()
-   */
-  public String update() {
-    return pz2.update();
+  public void doSearch() { 
+    stateMgr.hasPendingStateChange("search",false);
+    data.reset();
+    req.getRecord().removeParameters();
+    req.getShow().setParameter(new CommandParameter("start","=",0));    
+    logger.debug(Utils.objectId(this) + " is searching using "+req.getCommandReadOnly("search").getUrlEncodedParameterValue("query"));
+    doCommand("search");    
   }
-
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#update(java.lang.String)
+      
+  /**
+   * Refreshes 'show', 'stat', 'termlist', and 'bytarget' data object from pazpar2
+   * 
+   * @return Number of activeclients at the time of the 'show' command.
    */
-  public String update(String commands) {
-    return pz2.update(commands);
+  public String update () {
+    logger.debug("Updating show,stat,termlist,bytarget from pazpar2");
+    return update("show,stat,termlist,bytarget");
   }
-  
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#toggleRecord(java.lang.String)
+   
+  /**
+   * Refreshes the data objects listed in 'commands' from pazpar2
+   * 
+   * @param commands
+   * @return Number of activeclients at the time of the 'show' command
    */
-  public String toggleRecord(String recid) {
-    return pz2.toggleRecord(recid);
-  }
-  
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getShow()
-   */
-  public ShowResponse getShow() {
-    return pz2.getShow();
-  }
-  
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getStat()
-   */
-  public StatResponse getStat() {
-    return pz2.getStat();
-  }
+  public String update (String commands) {
+    if (! hasConfigurationErrors()) {
+      if (hasQuery()) {
+        handleQueryStateChanges(commands);
+        logger.debug("Processing request for " + commands); 
+        List<CommandThread> threadList = new ArrayList<CommandThread>();
+        StringTokenizer tokens = new StringTokenizer(commands,",");
+        while (tokens.hasMoreElements()) {          
+          threadList.add(new CommandThread(req.getCommandReadOnly(tokens.nextToken()),searchClient));            
+        }
+        for (CommandThread thread : threadList) {
+          thread.start();
+        }
+        for (CommandThread thread : threadList) {
+          try {
+            thread.join();
+          } catch (InterruptedException e) {
+            e.printStackTrace();
+          }
+        }
+        for (CommandThread thread : threadList) {
+           String commandName = thread.getCommand().getName();
+           String response = thread.getResponse();
+           logger.debug("Response was: " + response);
+           Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);
+           data.put(commandName, responseObject);        
+        }
+        if (commands.equals("record")) {
+          logger.debug("Record: Active clients: "+data.getRecord().getActiveClients());
+          return data.getRecord().getActiveClients();
+        } else {
+          return data.getActiveClients();
+        }  
+      } else {
+        logger.debug("Skipped requests for " + commands + " as there's not yet a query."); 
+        data.reset();
+        return "0";
+      }
+    } else {
+      logger.error("Did not attempt to execute query since there are configuration errors.");
+      return "0";
+    }
     
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasRecord(java.lang.String)
-   */
-  public boolean hasRecord(String recId) {    
-    return pz2.hasRecord(recId);
   }
-  
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getRecord()
-   */
-  public RecordResponse getRecord() {
-    return pz2.getRecord();
+                                
+  public String toggleRecord (String recId) {
+    if (hasRecord(recId)) {
+      req.getRecord().removeParameters();  
+      data.put("record", new RecordResponse());
+      return "";
+    } else {
+      req.getRecord().setRecordId(recId);
+      return doCommand("record");
+    }
   }
   
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTermLists()
-   */
-  public TermListsResponse getTermLists() {
-    return pz2.getTermLists();
+  @Override
+  public boolean hasRecord (String recId) {
+    return req.getCommandReadOnly("record").hasParameters() && data.getRecord().getRecId().equals(recId);
   }
-  
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getFacetTerms(java.lang.String, int)
-   */
-  public List<TermResponse> getFacetTerms(String facet, int count) {
-    return pz2.getFacetTerms(facet, count);
+        
+  public String getCurrentStateKey () {    
+    return stateMgr.getCurrentState().getKey();
+  }
+      
+  public void setCurrentStateKey(String key) {       
+    stateMgr.setCurrentStateKey(key);
   }
   
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getFacetTerms(java.lang.String)
-   */
-  public List<TermResponse> getFacetTerms(String facet) {  
-    return pz2.getFacetTerms(facet);
-  }  
-  
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getByTarget()
-   */
-  public ByTarget getByTarget() {  
-    return pz2.getByTarget();
+  public boolean hasConfigurationErrors () {
+      return (configurationErrors.size()>0);      
   }
   
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasRecords()
-   */
-  public boolean hasRecords() {
-    return pz2.hasRecords();
+  public boolean hasCommandErrors () {
+    return data.hasApplicationError();
   }
   
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setPager(int)
+  /**
+   * Returns true if application error found in any response data objects 
    */
-  public ResultsPager setPager(int pageRange) {
-    return pz2.setPager(pageRange);
+  public boolean hasErrors () {
+    return hasConfigurationErrors() || hasCommandErrors();
   }
 
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getPager()
-   */
-  public ResultsPager getPager() {
-    return pz2.getPager();
+  public List<ErrorInterface> getConfigurationErrors() {    
+    return configurationErrors;
   }
   
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getCurrentStateKey()
-   */
-  public String getCurrentStateKey() {
-    return pz2.getCurrentStateKey();
+  
+  protected boolean hasQuery() {    
+    return req.getSearch().getParameter("query") != null && req.getSearch().getParameter("query").getValueWithExpressions().length()>0;
   }
     
-  /* (non-Javadoc)
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setCurrentStateKey(java.lang.String)
-   */
-  public void setCurrentStateKey(String key) {
-    pz2.setCurrentStateKey(key);    
+    
+  public ResultsPager getPager () {
+    if (pager == null) {
+      pager = new ResultsPager(data);      
+    } 
+    return pager;      
   }
   
-  public boolean hasErrors() {
-    return pz2.hasErrors();
+  public ResultsPager setPager (int pageRange) {
+    pager =  new ResultsPager(data,pageRange,req);
+    return pager;
   }
-    
-  public ErrorInterface getCommandError() {
-    return pz2.getCommandError();
+  
+  protected ErrorHelper getTroubleshooter() {
+    return errorHelper;
   }
   
-  public List<ErrorInterface> getConfigurationErrors () {
-    return pz2.getConfigurationErrors();
+  protected void handleQueryStateChanges (String commands) {
+    if (stateMgr.hasPendingStateChange("search") && hasQuery()) { 
+      logger.debug("Found pending search change. Doing search before updating " + commands);      
+      doSearch();
+    } 
+    if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) {        
+      logger.debug("Found pending record ID change. Doing record before updating " + commands);
+      stateMgr.hasPendingStateChange("record",false);
+      if (req.getCommandReadOnly("record").hasParameters()) {
+        update("record");
+      } else {
+        req.getRecord().removeParameters();  
+        data.put("record", new RecordResponse());
+      }
+    }
   }
-
-  @Override
-  public boolean hasCommandErrors() {
-    return pz2.hasCommandErrors();
+  
+  protected String doCommand(String commandName) {             
+    logger.debug(req.getCommandReadOnly(commandName).getEncodedQueryString() + ": Results for "+ req.getCommandReadOnly("search").getEncodedQueryString());
+    return update(commandName);
   }
-
+  
   @Override
-  public boolean hasConfigurationErrors() {
-    return pz2.hasConfigurationErrors();
+  public void stateUpdated(String commandName) {
+    logger.debug("State change reported for [" + commandName + "]");
+    if (commandName.equals("show")) {
+      logger.debug("Updating show");
+      update(commandName);
+    } 
   }
-  
+
+
 }
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
index 058a3e1..39adf03 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Client.java
@@ -9,9 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-
 import org.apache.log4j.Logger;
 
 import com.indexdata.masterkey.config.MissingMandatoryParameterException;
@@ -29,7 +26,6 @@ import com.indexdata.pz2utils4jsf.errors.ConfigurationException;
 import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;
 import com.indexdata.pz2utils4jsf.utils.Utils;
 
-@Named @SessionScoped 
 public class Pz2Client implements SearchClient {
 
   private static final long serialVersionUID = 5414266730169982028L;
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java
index 0c509fc..b403d8d 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Interface.java
@@ -5,12 +5,6 @@ import java.util.List;
 
 import com.indexdata.pz2utils4jsf.controls.ResultsPager;
 import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;
-import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;
 
 public interface Pz2Interface extends Serializable {
 
@@ -61,74 +55,14 @@ public interface Pz2Interface extends Serializable {
    * @return
    */
   public String toggleRecord(String recid);
-    
-  /**
-   * Returns the 'show' data as retrieved from pazpar2 by the most 
-   * recent update request
-   * 
-   * @return pazpar2 'show' response object
-   */
-  public ShowResponse getShow();
-    
-  /**
-   * Returns the 'stat' data as retrieved from pazpar2 by the most 
-   * recent update request
-   * 
-   * @return pazpar2 'stat' response object
-   */
-  public StatResponse getStat();
-  
+      
   /**
    * Resolves whether the backend has a record with the given recid in memory 
    * 
    * @return true if the bean currently holds the record with recid
    */  
   public boolean hasRecord (String recId);
-  
-  /**
-   * Resolves whether the back-end has any records in memory (in 'show') for 
-   * display in UI
-   * 
-   * @return true if there are records to display
-   */
-  public boolean hasRecords ();
-        
-  /**
-   * Returns a pazpar2 record as retrieved by the most recent 'record'
-   * request 
-   * @return record data object
-   */
-  public RecordResponse getRecord();
-  
-  /**
-   * Returns a set of term lists (targets and facets) as retrieved by the 
-   * most recent 'termlist' command 
-   * @return set of termlists
-   */
-  public TermListsResponse getTermLists ();
-  
-  /**
-   * Returns up to 'count' terms from the facet given by the 'facet' parameter
-   * @param facet  name of the facet
-   * @param count  maximum number of facet terms to return
-   * @return facet term list limited to 'count' terms
-   */
-  public List<TermResponse> getFacetTerms (String facet, int count);
-    
-  /**
-   * Returns all the terms of a given facet - or as many as pazpar2 returns
-   * @param facet name of the facet
-   * @return facet term list
-   */
-  public List<TermResponse> getFacetTerms (String facet);
-  
-  /**
-   * Returns a ByTarget data object as retrieved by the most recent 'bytarget' 
-   * request to pazpar2
-   * 
-   * @return ByTarget response data object
-   */
-  public ByTarget getByTarget();
+          
     
   /**
    * Initiates a pager object, a component holding the data to draw a sequence
@@ -181,14 +115,6 @@ public interface Pz2Interface extends Serializable {
    */
   public boolean hasConfigurationErrors();
   
-  /**
-   * Returns one (of possibly multiple) errors encountered during execution of commands
-   * Will prefer to show the search errors - if any - as the search command is usually 
-   * executed first.  
-   * 
-   * @return
-   */
-  public ErrorInterface getCommandError();
   
   /**
    * Returns all errors encountered during configuration of the application, in particular
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
index 15821ea..7651860 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2ProxyBean.java
@@ -11,13 +11,9 @@ import javax.inject.Named;
 
 import org.apache.log4j.Logger;
 
-import com.indexdata.pz2utils4jsf.config.Configuration;
 import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
-import com.indexdata.pz2utils4jsf.pazpar2.commands.SearchCommand;
-import com.indexdata.pz2utils4jsf.pazpar2.sp.ForServiceProxy;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyClient;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxyInterface;
-import com.indexdata.pz2utils4jsf.pazpar2.sp.ServiceProxySession;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.ServiceProxyUser;
 import com.indexdata.pz2utils4jsf.utils.Utils;
 
@@ -26,95 +22,101 @@ public class Pz2ProxyBean extends Pz2Bean implements ServiceProxyInterface {
     
   private static final long serialVersionUID = 4221824985678758225L;
   private static Logger logger = Logger.getLogger(Pz2ProxyBean.class);  
+  private String initDocFileName = "";
+  private String initDocResponse = "";
+  private String serviceProxyUrl = "";  
     
   @Inject ConfigurationReader configurator;
-  @Inject ServiceProxyUser user;  
-  @Inject @ForServiceProxy ServiceProxySession pz2;
+  @Inject ServiceProxyUser user;    
   
   public Pz2ProxyBean() {
   }
   
   @PostConstruct
-  public void instantiateServiceProxyClient() {
-    logger.debug(Utils.objectId(this) + " will instantiate a ServiceProxyClient next.");    
-    searchClient = new ServiceProxyClient();
-    logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
-                          + Utils.objectId(configurator) + "] on session [" 
-                          + Utils.objectId(pz2) + "]" );    
-    pz2.configureClient(searchClient,configurator);
+  public void postConstruct() {
+    if (searchClient == null) {
+      logger.debug(Utils.objectId(this) + " will instantiate a ServiceProxyClient next.");    
+      searchClient = new ServiceProxyClient();
+      logger.info("Using [" + Utils.objectId(searchClient) + "] configured by [" 
+                            + Utils.objectId(configurator) + "]" );    
+      configureClient(searchClient,configurator);
+    } else {
+      logger.info("Pz2ProxyBean:postConstruct: searchClient already instantiated " +
+      		        "during construction of parent object Pz2Bean.");
+    }
   }
 
   @Override
   public String login(String navigateTo) {
     logger.info("doing login");
-    session().setUser(user);
-    session().resetDataObjects();
-    session().removeCommand("record");
-    ((SearchCommand)session().getCommand("search")).setQuery(null);
-    return session().login(navigateTo);
-  }
-
-  @Override
-  public void setInitFileName(String fileName) {
-    logger.info("Setting init file name: " + fileName);
-    session().setInitFileName(fileName);      
+    ((ServiceProxyClient)searchClient).authenticate(user);
+    data.reset();
+    req.getRecord().removeParameters();
+    req.getSearch().setQuery(null);
+    
+    return navigateTo;
   }
 
   @Override
-  public String getInitFileName() {
-    return session().getInitFileName();
-  }
-  
-  public void setAceFilter (String filterExpression) {
-    session().setAceFilter(filterExpression);
+  public void setServiceProxyUrl(String url) {
+    logger.info("Setting Service Proxy url: " + url);
+    serviceProxyUrl = url;
+    req.getSearch().setQuery(null);
+    data.reset();
   }
   
-  public String getAceFilter () {
-    return session().getAceFilter();
+  public String getServiceProxyUrl() {
+    return serviceProxyUrl;
   }
-
-  @Override
-  public String postInit() throws UnsupportedEncodingException, IOException {
-    logger.info("Posting init: " + System.currentTimeMillis());
-    session().postInit();
-    return "";
+    
+  public String getInitDocPath () {
+    return searchClient.getConfiguration().get("INIT_DOC_PATH");
   }
   
-  public String postInit(byte[] initDoc) throws UnsupportedEncodingException, IOException {
-    logger.info("Posting init: " + System.currentTimeMillis());
-    session().postInit(initDoc);
-    return "";
+  @Override
+  public void setInitFileName(String fileName) {
+    this.initDocFileName = fileName;
     
   }
 
   @Override
-  public void setServiceProxyUrl(String url) {
-    logger.info("Setting Service Proxy url: " + url);
-    session().setServiceProxyUrl(url); 
-    ((SearchCommand)session().getCommand("search")).setQuery(null);
-    session().resetDataObjects();
+  public String getInitFileName() {
+    return initDocFileName;
   }
 
   @Override
-  public String getServiceProxyUrl() {
-    return session().getServiceProxyUrl();    
+  public String postInit() throws UnsupportedEncodingException, IOException {    
+    String initDocPath = ((ServiceProxyClient)searchClient).getInitDocPaths()[0];
+    logger.info("Paths: " + ((ServiceProxyClient)searchClient).getInitDocPaths());
+    logger.info("Path: " + initDocPath);
+    data.reset();
+    byte[] response = ((ServiceProxyClient)searchClient).postInitDoc(initDocPath + getInitFileName());
+    initDocResponse = new String(response,"UTF-8");
+    return initDocResponse;
   }
   
-  public ServiceProxySession session() {
-    return (ServiceProxySession)pz2;
+  @Override
+  public String postInit(byte[] initDoc) throws UnsupportedEncodingException, IOException {    
+    data.reset();
+    byte[] response = ((ServiceProxyClient)searchClient).postInitDoc(initDoc);
+    initDocResponse = new String(response,"UTF-8");
+    return initDocResponse;
   }
 
+
   @Override
   public String getInitResponse() {
-    return session().getInitResponse();
+    return initDocResponse;
   }
   
-  public Configuration getClientConfiguration() {
-    return session().client().getConfiguration();
+  public void setAceFilter(String filterExpression) {
+    //setCommandParameter("record",new CommandParameter("acefilter","=",filterExpression));
   }
   
-  public String getInitDocPath () {
-    return session().client().getConfiguration().get("INIT_DOC_PATH");
+  public String getAceFilter () {
+    return null;
+    // return getCommandParameterValue("record","acefilter","");
   }
 
+
 }
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
deleted file mode 100644
index 4d7ac5f..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ /dev/null
@@ -1,420 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-
-import com.indexdata.pz2utils4jsf.config.ConfigurationReader;
-import com.indexdata.pz2utils4jsf.controls.ResultsPager;
-import com.indexdata.pz2utils4jsf.errors.ConfigurationError;
-import com.indexdata.pz2utils4jsf.errors.ConfigurationException;
-import com.indexdata.pz2utils4jsf.errors.ErrorHelper;
-import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;
-import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;
-import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Commands;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ByTarget;
-import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;
-import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseData;
-import com.indexdata.pz2utils4jsf.pazpar2.data.Pazpar2ResponseParser;
-import com.indexdata.pz2utils4jsf.pazpar2.data.RecordResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.SearchResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;
-import com.indexdata.pz2utils4jsf.pazpar2.state.StateListener;
-import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;
-import com.indexdata.pz2utils4jsf.utils.Utils;
-
-@ForStraightPz2
-public class Pz2Session implements Pz2Interface, StateListener {
-    
-  private static final long serialVersionUID = 3947514708343320514L;
-  private static Logger logger = Logger.getLogger(Pz2Session.class);
-  
-  protected Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();
-  
-  @Inject StateManager stateMgr;
-  @Inject Pazpar2Commands req;
-  
-  protected ErrorHelper errorHelper = null;
-  
-  protected List<ErrorInterface> configurationErrors = null;
-  protected SearchClient searchClient = null;       
-  protected ResultsPager pager = null; 
-    
-  public Pz2Session () {
-    logger.info("Instantiating pz2 session object [" + Utils.objectId(this) + "]");        
-  }
-  
-  @PostConstruct
-  public void listenToStateManager() {
-    logger.debug("in post-construct of Pz2Session stateMgr is " + stateMgr);
-    logger.debug("in post-construct req is " + req);
-    stateMgr.addStateListener(this);
-  }
-    
-  public void configureClient(SearchClient searchClient, ConfigurationReader configReader) {
-    configurationErrors = new ArrayList<ErrorInterface>();
-    errorHelper = new ErrorHelper(configReader);    
-    logger.debug(Utils.objectId(this) + " will configure search client for the session");
-    try {
-      searchClient.configure(configReader);            
-      // At the time of writing this search client is injected using Weld. 
-      // However, the client is used for asynchronously sending off requests
-      // to the server AND propagation of context to threads is currently 
-      // not supported. Trying to do so throws a WELD-001303 error. 
-      // To avoid that, a context free client is cloned from the context 
-      // dependent one. 
-      // If propagation to threads gets supported, the cloning can go. 
-      this.searchClient = searchClient.cloneMe();         
-    } catch (ConfigurationException e) {
-      configurationErrors.add(new ConfigurationError("Search Client","Configuration",e.getMessage(),new ErrorHelper(configReader)));          
-    } 
-    logger.info(configReader.document());
-    resetDataObjects();
-  }
-      
-  public void doSearch(String query) {
-    setCommandParameter("search",new CommandParameter("query","=",query));     
-    doSearch();
-  }
-
-  public void doSearch() { 
-    stateMgr.hasPendingStateChange("search",false);
-    resetDataObjects();
-    removeCommand("record");
-    setCommandParameter("show",new CommandParameter("start","=",0));    
-    logger.debug(Utils.objectId(this) + " is searching using "+req.getCommandReadOnly("search").getUrlEncodedParameterValue("query"));
-    doCommand("search");    
-  }
-      
-  /**
-   * Refreshes 'show', 'stat', 'termlist', and 'bytarget' data object from pazpar2
-   * 
-   * @return Number of activeclients at the time of the 'show' command.
-   */
-  public String update () {
-    logger.debug("Updating show,stat,termlist,bytarget from pazpar2");
-    return update("show,stat,termlist,bytarget");
-  }
-   
-  /**
-   * Refreshes the data objects listed in 'commands' from pazpar2
-   * 
-   * @param commands
-   * @return Number of activeclients at the time of the 'show' command
-   */
-  public String update (String commands) {
-    if (! hasConfigurationErrors()) {
-      if (hasQuery()) {
-        handleQueryStateChanges(commands);
-        logger.debug("Processing request for " + commands); 
-        List<CommandThread> threadList = new ArrayList<CommandThread>();
-        StringTokenizer tokens = new StringTokenizer(commands,",");
-        while (tokens.hasMoreElements()) {          
-          threadList.add(new CommandThread(req.getCommandReadOnly(tokens.nextToken()),searchClient));            
-        }
-        for (CommandThread thread : threadList) {
-          thread.start();
-        }
-        for (CommandThread thread : threadList) {
-          try {
-            thread.join();
-          } catch (InterruptedException e) {
-            e.printStackTrace();
-          }
-        }
-        for (CommandThread thread : threadList) {
-           String commandName = thread.getCommand().getName();
-           String response = thread.getResponse();
-           logger.debug("Response was: " + response);
-           Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);
-           dataObjects.put(commandName, responseObject);        
-        }
-        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();
-        return "0";
-      }
-    } else {
-      logger.error("Did not attempt to execute query since there are configuration errors.");
-      return "0";
-    }
-    
-  }
-            
-                    
-  public String toggleRecord (String recId) {
-    if (hasRecord(recId)) {
-      removeCommand("record");  
-      dataObjects.put("record", new RecordResponse());
-      return "";
-    } else {
-      req.getRecord().setRecordId(recId);
-      return doCommand("record");
-    }
-  }
-  
-  @Override
-  public boolean hasRecord (String recId) {
-    return req.getCommandReadOnly("record").hasParameters() && getRecord().getRecId().equals(recId);
-  }
-      
-  public ShowResponse getShow () {
-    return ((ShowResponse) dataObjects.get("show"));
-  }
-  
-  public StatResponse getStat () {
-    return ((StatResponse) dataObjects.get("stat"));
-  }
-  
-  public RecordResponse getRecord() {
-    return ((RecordResponse) dataObjects.get("record"));
-  }
-  
-  public TermListsResponse getTermLists () {
-    return ((TermListsResponse) dataObjects.get("termlist"));
-  }
-  
-  public List<TermResponse> getFacetTerms (String facet, int count) {
-    return (getTermLists().getTermList(facet).getTerms(count));
-  }
-    
-  public List<TermResponse> getFacetTerms (String facet) {
-    return (getTermLists().getTermList(facet).getTerms());
-  }
-  
-  public ByTarget getByTarget() {
-    return ((ByTarget) dataObjects.get("bytarget"));
-  }
-  
-  
-  public String getCurrentStateKey () {    
-    return stateMgr.getCurrentState().getKey();
-  }
-      
-  public void setCurrentStateKey(String key) {       
-    stateMgr.setCurrentStateKey(key);
-  }
-  
-  public boolean hasConfigurationErrors () {
-      return (configurationErrors.size()>0);      
-  }
-  
-  public boolean hasCommandErrors () {
-    if (dataObjects.get("search").hasApplicationError()) {
-      logger.info("Error detected in search");
-      return true;
-    }
-    for (String name : dataObjects.keySet()) {
-      if (dataObjects.get(name).hasApplicationError()) {
-        logger.info("Error detected in " + name);
-        return true;
-      }
-    }    
-    return false;    
-  }
-  
-  /**
-   * Returns true if application error found in any response data objects 
-   */
-  public boolean hasErrors () {
-    return hasConfigurationErrors() || hasCommandErrors();
-  }
-
-  public List<ErrorInterface> getConfigurationErrors() {    
-    return configurationErrors;
-  }
-  
-  /**
-   * Returns a search command error, if any, otherwise the first
-   * error found for an arbitrary command, if any, otherwise
-   * an empty dummy error. 
-   */    
-  public ErrorInterface getCommandError() {
-    CommandError error = new CommandError();    
-    if (dataObjects.get("search").hasApplicationError()) {
-      error = dataObjects.get("search").getApplicationError();                        
-    } else {
-      for (String name : dataObjects.keySet()) {     
-        if (dataObjects.get(name).hasApplicationError()) {     
-          error = dataObjects.get(name).getApplicationError(); 
-          break;
-        } 
-      }
-    }
-    error.setErrorHelper(errorHelper);
-    return error;         
-  }
-  
-  protected boolean hasQuery() {    
-    return req.getSearch().getParameter("query") != null && req.getSearch().getParameter("query").getValueWithExpressions().length()>0;
-  }
-    
-  public boolean hasRecords () {
-    return getStat().getRecords() > 0            
-           && getShow().getHits() != null 
-           && getShow().getHits().size()>0;
-  }
-    
-  public ResultsPager getPager () {
-    if (pager == null) {
-      pager = new ResultsPager(this);      
-    } 
-    return pager;      
-  }
-  
-  public ResultsPager setPager (int pageRange) {
-    pager =  new ResultsPager(this,pageRange,req);
-    return pager;
-  }
-  
-  protected ErrorHelper getTroubleshooter() {
-    return errorHelper;
-  }
-  
-  protected void handleQueryStateChanges (String commands) {
-    if (stateMgr.hasPendingStateChange("search") && hasQuery()) { 
-      logger.debug("Found pending search change. Doing search before updating " + commands);      
-      doSearch();
-    } 
-    if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) {        
-      logger.debug("Found pending record ID change. Doing record before updating " + commands);
-      stateMgr.hasPendingStateChange("record",false);
-      if (req.getCommandReadOnly("record").hasParameters()) {
-        update("record");
-      } else {
-        removeCommand("record");  
-        dataObjects.put("record", new RecordResponse());
-      }
-    }
-  }
-
-  protected String getActiveClients() {    
-    if (getShow()!=null) {
-      logger.debug("Active clients: "+getShow().getActiveClients());
-      return getShow().getActiveClients();
-    } else {
-      return "";
-    }
-  }
-
-  /**
-   * Returns a Pazpar2 command 'detached' from the current Pazpar2 state.
-   * 
-   * 'Detached' is meant to imply that this is a copy of a command in the 
-   * current state, detached so as to NOT change the current state if 
-   * modified. It can be viewed and executed, however. 
-   * 
-   * In order to modify the command with effect for subsequent searches,
-   * it must be checked back into the StateManager, which will
-   * then create a new current Pazpar2 state as needed.
-   *  
-   * @param name
-   * @return
-   */
-  protected Pazpar2Command getCommand(String name) {
-    return req.getCommand(name);
-  }
-  
-  /** 
-   * Returns an interface to a Pazpar2Command with only String getters.
-   * 
-   * Since the command cannot be modified (unless it is cast) we can avoid 
-   * cloning it before returning it from the current state. 
-   * It can be used for log statements, checks and for performing the 
-   * actual pazpar2 request. 
-   * 
-   * @param name
-   * @return
-   */
-  protected CommandReadOnly getCommandReadOnly(String name) {
-    return req.getCommandReadOnly(name);
-  }
-
-  
-  protected void setCommandParameter(String commandName, CommandParameter parameter) {
-    logger.debug("Setting parameter for " + commandName + ": " + parameter);
-    Pazpar2Command command = req.getCommand(commandName);
-    command.setParameter(parameter);
-    stateMgr.checkIn(command);    
-  }
-  
-  
-  protected void removeCommandParameter(String commandName, String parameterName) {
-    Pazpar2Command command = req.getCommand(commandName);
-    command.removeParameter(parameterName);
-    stateMgr.checkIn(command);    
-  }
-  
-  protected void removeCommand (String commandName) {
-    Pazpar2Command command = req.getCommand(commandName);
-    command.removeParameters();
-    stateMgr.checkIn(command);
-  }
-    
-  protected String getCommandParameterValue (String commandName, String parameterName, String defaultValue) {    
-    CommandReadOnly command = req.getCommandReadOnly(commandName);
-    if (command != null) {
-      String parameter = command.getParameterValue(parameterName);
-      if (parameter != null) {
-        return parameter;
-      }
-    }
-    return defaultValue;    
-  }
-    
-  protected int getCommandParameterValue (String commandName, String parameterName, int defaultValue) {
-    CommandReadOnly command = req.getCommandReadOnly(commandName);
-    if (command != null) {
-      String parameter = command.getParameterValue(parameterName);
-      if (parameter != null) {
-        return Integer.parseInt(parameter);
-      }
-    }
-    return defaultValue;    
-  }
-
-  protected String doCommand(String commandName) {             
-    logger.debug(req.getCommandReadOnly(commandName).getEncodedQueryString() + ": Results for "+ req.getCommandReadOnly("search").getEncodedQueryString());
-    return update(commandName);
-  }
-  
-  protected void resetDataObjects() {
-    logger.debug("Resetting show,stat,termlist,bytarget,search response objects.");
-    dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();
-    dataObjects.put("show", new ShowResponse());
-    dataObjects.put("stat", new StatResponse());
-    dataObjects.put("termlist", new TermListsResponse());
-    dataObjects.put("bytarget", new ByTarget());
-    dataObjects.put("record", new RecordResponse());
-    dataObjects.put("search", new SearchResponse());
-  }
-  
-
-  @Override
-  public void stateUpdated(String commandName) {
-    logger.debug("State change reported for [" + commandName + "]");
-    if (commandName.equals("show")) {
-      logger.debug("Updating show");
-      update(commandName);
-    } 
-  }
-  
-}
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
index 680e37d..e0680c7 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
@@ -19,7 +19,12 @@ public class Pazpar2Command implements CommandReadOnly, Serializable  {
     
   public Pazpar2Command (String name, StateManager stateMgr) {
     this.name = name;
-    this.stateMgr = stateMgr;
+    if (stateMgr == null) {
+      // Set one-off dummy state mgr
+      this.stateMgr = new StateManager();
+    } else {
+      this.stateMgr = stateMgr;
+    }
   }
       
   public Pazpar2Command copy () {
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/Pazpar2Responses.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/Pazpar2Responses.java
new file mode 100644
index 0000000..25b7670
--- /dev/null
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/Pazpar2Responses.java
@@ -0,0 +1,123 @@
+package com.indexdata.pz2utils4jsf.pazpar2.data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+
+import org.apache.log4j.Logger;
+
+import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
+
+@Named("data") @SessionScoped
+public class Pazpar2Responses implements Serializable {
+  
+  private static final long serialVersionUID = -7543231258346154642L;
+  protected Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();
+  private static Logger logger = Logger.getLogger(Pazpar2Responses.class);
+
+  public Pazpar2Responses() {    
+  }
+  
+  public void put(String name, Pazpar2ResponseData responseData) {
+    dataObjects.put(name, responseData);
+  }
+  
+  public boolean hasApplicationError () {
+    if (getSearch().hasApplicationError()) {
+      logger.info("Error detected in search");
+      return true;
+    }
+    for (String name : dataObjects.keySet()) {
+      if (dataObjects.get(name).hasApplicationError()) {
+        logger.info("Error detected in " + name);
+        return true;
+      }
+    }    
+    return false;
+  }
+  
+  /**
+   * Returns a search command error, if any, otherwise the first
+   * error found for an arbitrary command, if any, otherwise
+   * an empty dummy error. 
+   */    
+  public ErrorInterface getCommandError() {
+    CommandError error = new CommandError();    
+    if (dataObjects.get("search").hasApplicationError()) {
+      error = dataObjects.get("search").getApplicationError();                        
+    } else {
+      for (String name : dataObjects.keySet()) {     
+        if (dataObjects.get(name).hasApplicationError()) {     
+          error = dataObjects.get(name).getApplicationError(); 
+          break;
+        } 
+      }
+    }
+    // TODO error.setErrorHelper(errorHelper);
+    return error;         
+  }
+  
+  public void reset() {
+    logger.debug("Resetting show,stat,termlist,bytarget,search response objects.");
+    dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();
+    dataObjects.put("show", new ShowResponse());
+    dataObjects.put("stat", new StatResponse());
+    dataObjects.put("termlist", new TermListsResponse());
+    dataObjects.put("bytarget", new ByTarget());
+    dataObjects.put("record", new RecordResponse());
+    dataObjects.put("search", new SearchResponse());
+  }
+
+  public ShowResponse getShow () {
+    return ((ShowResponse) dataObjects.get("show"));
+  }
+  
+  public StatResponse getStat () {
+    return ((StatResponse) dataObjects.get("stat"));
+  }
+  
+  public RecordResponse getRecord() {
+    return ((RecordResponse) dataObjects.get("record"));
+  }
+  
+  public SearchResponse getSearch() {
+    return ((SearchResponse) dataObjects.get("search"));
+  }
+  
+  public TermListsResponse getTermLists () {
+    return ((TermListsResponse) dataObjects.get("termlist"));
+  }
+  
+  public List<TermResponse> getFacetTerms (String facet, int count) {
+    return (getTermLists().getTermList(facet).getTerms(count));
+  }
+    
+  public List<TermResponse> getFacetTerms (String facet) {
+    return (getTermLists().getTermList(facet).getTerms());
+  }
+  
+  public ByTarget getByTarget() {
+    return ((ByTarget) dataObjects.get("bytarget"));
+  }
+
+  public boolean hasRecords () {
+    return getStat().getRecords() > 0            
+           && getShow().getHits() != null 
+           && getShow().getHits().size()>0;
+  }
+  
+  public String getActiveClients() {    
+    if (getShow()!=null) {
+      logger.debug("Active clients: "+getShow().getActiveClients());
+      return getShow().getActiveClients();
+    } else {
+      return "";
+    }
+  }
+
+
+}
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java
deleted file mode 100644
index 28b918c..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ForServiceProxy.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2.sp;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
-public @interface ForServiceProxy {
-
-}
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
index 4aee1cf..5b2e518 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxyClient.java
@@ -12,9 +12,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
@@ -46,10 +43,9 @@ import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;
 import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.AuthenticationEntity;
 import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.ServiceProxyUser;
-import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;
 import com.indexdata.pz2utils4jsf.utils.Utils;
 
-@Named @SessionScoped 
+
 public class ServiceProxyClient implements SearchClient {
     
   private static final long serialVersionUID = -4031644009579840277L;
@@ -98,7 +94,7 @@ public class ServiceProxyClient implements SearchClient {
     try {      
       logger.info("Authenticating [" + user.getProperty("name") + "]");
       this.user = (ServiceProxyUser) user;
-      Pazpar2Command auth = new Pazpar2Command("auth",new StateManager());
+      Pazpar2Command auth = new Pazpar2Command("auth",null);
       auth.setParameters(new CommandParameter("action","=","login"), 
                          new CommandParameter("username","=",user.getProperty("name")), 
                          new CommandParameter("password","=",user.getProperty("password")));
@@ -123,7 +119,7 @@ public class ServiceProxyClient implements SearchClient {
   
   public boolean checkAuthentication () {
     try {
-      Pazpar2Command check = new Pazpar2Command("auth",new StateManager());
+      Pazpar2Command check = new Pazpar2Command("auth",null);
       check.setParameter(new CommandParameter("action","=","check"));
       byte[] response = send(check);
       logger.info(new String(response,"UTF-8"));
diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java
deleted file mode 100644
index 7e79006..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/sp/ServiceProxySession.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2.sp;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import javax.enterprise.context.SessionScoped;
-
-import org.apache.log4j.Logger;
-
-import com.indexdata.pz2utils4jsf.pazpar2.Pz2Session;
-import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;
-import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.ServiceProxyUser;
-import com.indexdata.pz2utils4jsf.utils.Utils;
-
-@ForServiceProxy @SessionScoped
-public class ServiceProxySession extends Pz2Session implements ServiceProxyInterface {
-
-  private ServiceProxyUser user; 
-  private static final long serialVersionUID = -5770410029361522854L;
-  private static Logger logger = Logger.getLogger(ServiceProxySession.class);
-  private String initDocFileName = "";
-  private String initDocResponse = "";  
-    
-  public ServiceProxySession() {
-    logger.info("Instantiating SP pz2 session object [" + Utils.objectId(this) + "]");
-  }
-  
-  public void setUser(ServiceProxyUser user) {
-    this.user = user;
-  }
-
-  @Override
-  public String login(String navigateTo) {
-    if (client().authenticate(user)) {
-      return navigateTo;
-    } else {
-      return null;
-    }      
-  }
-
-  @Override
-  public void setInitFileName(String fileName) {
-    this.initDocFileName = fileName;
-    
-  }
-
-  @Override
-  public String getInitFileName() {
-    return initDocFileName;
-  }
-
-  @Override
-  public String postInit() throws UnsupportedEncodingException, IOException {    
-    String initDocPath = client().getInitDocPaths()[0];
-    logger.info("Paths: " + client().getInitDocPaths());
-    logger.info("Path: " + initDocPath);
-    this.resetDataObjects();
-    byte[] response = client().postInitDoc(initDocPath + getInitFileName());
-    initDocResponse = new String(response,"UTF-8");
-    return initDocResponse;
-  }
-  
-  @Override
-  public String postInit(byte[] initDoc) throws UnsupportedEncodingException, IOException {    
-    this.resetDataObjects();
-    byte[] response = client().postInitDoc(initDoc);
-    initDocResponse = new String(response,"UTF-8");
-    return initDocResponse;
-  }
-
-
-  @Override
-  public void setServiceProxyUrl(String url) {
-    client().setServiceProxyUrl(url);
-    
-  }
-
-  @Override
-  public String getServiceProxyUrl() {
-    return client().getServiceProxyUrl();
-  }
-  
-  public ServiceProxyClient client () {
-    return (ServiceProxyClient)searchClient;
-  }
-
-  @Override
-  public String getInitResponse() {
-    return initDocResponse;
-  }
-  
-  public void setAceFilter(String filterExpression) {
-    setCommandParameter("record",new CommandParameter("acefilter","=",filterExpression));
-  }
-  
-  public String getAceFilter () {
-    return getCommandParameterValue("record","acefilter","");
-  }
-  
-}
-- 
1.7.10.4