1 files changed, 55 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java b/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java
index b31d9961d..47f63ff6c 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CertRequestResourceService.java
@@ -40,6 +40,7 @@ import com.netscape.cms.servlet.request.model.CertRequestDAO;
 import com.netscape.cms.servlet.request.model.CertRequestInfo;
 import com.netscape.cms.servlet.request.model.CertRequestInfos;
 import com.netscape.cms.servlet.request.model.EnrollmentRequestData;
+import com.netscape.cmsutil.ldap.LDAPUtil;
 
 /**
  * @author alee
@@ -187,4 +188,58 @@ public class CertRequestResourceService extends CMSResourceService implements Ce
         return info;
     }
 
+    /**
+     * Used to generate list of cert requests based on the search parameters
+     */
+    public CertRequestInfos listRequests(String requestState, String requestType,
+            RequestId start, int pageSize, int maxResults, int maxTime) {
+        // auth and authz
+
+        // get ldap filter
+        String filter = createSearchFilter(requestState, requestType);
+        CMS.debug("listRequests: filter is " + filter);
+
+        // get start marker
+        if (start == null) {
+            start = new RequestId(CertRequestResource.DEFAULT_START);
+        }
+
+        CertRequestDAO reqDAO = new CertRequestDAO();
+        CertRequestInfos requests;
+        try {
+            requests =  reqDAO.listRequests(filter, start, pageSize, maxResults, maxTime, uriInfo);
+        } catch (EBaseException e) {
+            CMS.debug("listRequests: error in obtaining request results" + e);
+            e.printStackTrace();
+            throw new CMSException("Error listing cert requests!");
+        }
+        return requests;
+    }
+
+    private String createSearchFilter(String requestState, String requestType) {
+        String filter = "";
+        int matches = 0;
+
+        if ((requestState == null) && (requestType == null)) {
+            filter = "(requeststate=*)";
+            return filter;
+        }
+
+        if (requestState != null) {
+            filter += "(requeststate=" + LDAPUtil.escapeFilter(requestState) + ")";
+            matches++;
+        }
+
+        if (requestType != null) {
+            filter += "(requesttype=" + LDAPUtil.escapeFilter(requestType) + ")";
+            matches++;
+        }
+
+        if (matches > 1) {
+            filter = "(&" + filter + ")";
+        }
+
+        return filter;
+    }
+
 }