X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2Fcommands%2FSearchCommand.java;h=4c6d9c59006834bc45781c64bc37542998d3313a;hb=7b71381e71db35eed511606e80c0d3e18cab4d2b;hp=1d2cb2bbedf8acec3beb566fa698b2c380e91361;hpb=8a13a381070d913bd0b7fbdc664e401081d66b94;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
index 1d2cb2b..4c6d9c5 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
@@ -16,11 +16,7 @@ public class SearchCommand extends Pazpar2Command {
   public SearchCommand(StateManager stateMgr) {
     super("search",stateMgr);
   }
-  
-  public void setSession (String sessionId) {
-    setParameter(new CommandParameter("session","=",sessionId));
-  }
-  
+    
   public void setQuery(String query) {    
     setParameter(new CommandParameter("query","=",query));
   }
@@ -29,6 +25,69 @@ public class SearchCommand extends Pazpar2Command {
     return getParameter("query") == null ? null  : getParameter("query").getValueWithExpressions();
   }
   
+  public void setFilter(String filterExpression) {
+    setParameter(new CommandParameter("filter","=",filterExpression));
+  }
+  
+  public String getFilter() {
+    return getParameter("filter") == null ? null : getParameter("filter").getValueWithExpressions();
+  }
+  
+  public void addFilter(String filterExpression) {
+    // TODO: implement
+    if (hasParameterSet("filter")) {
+      setFilter(filterExpression);
+    } else {
+      getParameter("filter");
+    }
+    throw new UnsupportedOperationException("removeFilter(filterExpression) yet to be implemented.");
+  }
+  
+  public void removeFilters () {
+    removeParameter("filter");
+  }
+  
+  public void removeFilter(String filterExpression) {
+    // TODO: implement
+    throw new UnsupportedOperationException("removeFilter(filterExpression) yet to be implemented.");
+  }
+
+  public boolean hasFilter () {
+    return getFilter().length()>0;
+  }
+  
+  public void setLimit (String limitExpression) {
+    setParameter(new CommandParameter("limit","=",limitExpression));
+  }
+  
+  public String getLimit () {
+    return getParameterValue("limit");
+  }
+      
+  public void setStartrecs (String startrecs) {
+    setParameter(new CommandParameter("startrecs","=",startrecs));
+  }
+  
+  public String getStartrecs () {
+    return getParameterValue("startrecs");
+  }
+  
+  public void setMaxrecs (String maxrecs) {
+    setParameter(new CommandParameter("maxrecs","=",maxrecs));
+  }
+  
+  public String getMaxrecs () {
+    return getParameterValue("maxrecs");
+  }
+  
+  public void setSort () {
+    setParameter(new CommandParameter("sort","=","sort"));
+  }
+  
+  public String getSort () {
+    return getParameterValue("sort");
+  }
+  
   /**
    * Sets a facet, in CQL, to restrict the current results,
    * then executes the search 
@@ -75,17 +134,6 @@ public class SearchCommand extends Pazpar2Command {
     }
   }
   
-  public void setFilter(String filterExpression) {
-    setParameter(new CommandParameter("filter","=",filterExpression));
-  }
-  
-  public String getFilter() {
-    return getParameter("filter") == null ? null : getParameter("filter").getValueWithExpressions();
-  }
-  
-  public boolean hasFilter () {
-    return getFilter().length()>0;
-  }
   
   /**
    * Adds a single target filter to restrict the current query by, 
@@ -141,28 +189,6 @@ public class SearchCommand extends Pazpar2Command {
   protected boolean hasSingleTargetFilter(SingleTargetFilter targetFilter) {
     return hasSingleTargetFilter() && targetFilter.equals(this.singleTargetFilter);
   }
-
-  
-  public void setLimit (String limit) {
-    // TODO
-  }
-      
-  public void addFilter(String filterExpression) {
-    if (hasParameterSet("filter")) {
-      setFilter(filterExpression);
-    } else {
-      //TODO
-      getParameter("filter");
-    }
-  }
-  
-  public void removeFilters () {
-    
-  }
-  
-  public void removeFilter(String filterExpression) {
-    
-  }
     
   public SearchCommand copy () {
     SearchCommand newCommand = new SearchCommand(stateMgr);
@@ -173,5 +199,4 @@ public class SearchCommand extends Pazpar2Command {
     return newCommand;
   }
 
-
 }