Ticket 149 - Implementing the search functionality,server side.

            Search function call supporting various already present.
            Changes the ds call from searchCertificates to CertificateRepository.findCertRecords().
            Added pagination using start and size options . provided in command line.

Conflicts:
	base/common/src/com/netscape/cms/client/cert/CertRestClient.java

2 files changed, 18 insertions, 3 deletions

diff --git a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
index 4890a6682..ea88c46cd 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertFindCLI.java
@@ -103,10 +103,16 @@ public class CertFindCLI extends CLI {
             searchData = new CertSearchData();
             searchData.setSerialNumberRangeInUse(true);
         }
+        String s = cmd.getOptionValue("start");
+        Integer start = s == null ? null : Integer.valueOf(s);
+
+        s = cmd.getOptionValue("size");
+        Integer size = s == null ? null : Integer.valueOf(s);
+
         addSearchAttribute(cmd, searchData);
         CertDataInfos certs = null;
         try {
-            certs = parent.client.findCerts(searchData);
+            certs = parent.client.findCerts(searchData, start, size);
         } catch (CMSException e) {
             System.err.println("Error: Cannot list certificates. " + e.getMessage());
             System.exit(-1);
@@ -136,6 +142,15 @@ public class CertFindCLI extends CLI {
 
         Option option = null;
 
+        //pagination options
+        option = new Option(null, "start", true, "Page start");
+        option.setArgName("start");
+        options.addOption(option);
+
+        option = new Option(null, "size", true, "Page size");
+        option.setArgName("size");
+        options.addOption(option);
+
         //help
         options.addOption(null, "help", false, "Show help options");
 
diff --git a/base/common/src/com/netscape/cms/client/cert/CertRestClient.java b/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
index 3559047b7..7c8b9f3e4 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertRestClient.java
@@ -54,8 +54,8 @@ public class CertRestClient extends CMSRestClient {
         return certClient.getCert(id);
     }
 
-    public CertDataInfos findCerts(CertSearchData data) {
-        return certClient.searchCerts(data, CertResource.DEFAULT_MAXRESULTS, CertResource.DEFAULT_MAXTIME);
+    public CertDataInfos findCerts(CertSearchData data, Integer start, Integer size) {
+        return certClient.searchCerts(data, start, size);
     }
 
     public CertRequestInfo revokeCert(CertId id, CertRevokeRequest request) {