Allow LogServlet to query based upon Filename

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / LogServlet.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
index eceab57..8a1a4ba 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
@@ -69,7 +69,7 @@ public class LogServlet extends BaseServlet {
     private static final String FMT_1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
     private static final String FMT_2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";\r
 \r
-    private static  boolean isfeedlog;\r
+    private boolean isfeedlog;\r
 \r
     public abstract class RowHandler {\r
         private final ServletOutputStream out;\r
@@ -281,12 +281,14 @@ public class LogServlet extends BaseServlet {
                 map.put("err", "bad type");\r
                 return map;\r
             }\r
-        } else\r
+        } else {\r
             map.put("type", "all");\r
+        }\r
         map.put("publishSQL", "");\r
         map.put("statusSQL", "");\r
         map.put("resultSQL", "");\r
         map.put("reasonSQL", "");\r
+        map.put("filenameSQL", "");\r
 \r
         s = req.getParameter("publishId");\r
         if (s != null) {\r
@@ -297,6 +299,11 @@ public class LogServlet extends BaseServlet {
             map.put("publishSQL", " AND PUBLISH_ID = '"+s+"'");\r
         }\r
 \r
+        s = req.getParameter("filename");\r
+        if (s != null) {\r
+            map.put("filenameSQL", " AND FILENAME = '"+s+"'");\r
+        }\r
+\r
         s = req.getParameter("statusCode");\r
         if (s != null) {\r
             String sql = null;\r
@@ -388,7 +395,7 @@ public class LogServlet extends BaseServlet {
         if (type.equals("all") || type.equals("pub")) {\r
             String sql = "select * from LOG_RECORDS where FEEDID = "+feedid\r
                 + " AND TYPE = 'pub'"\r
-                + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL");\r
+                + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL") + map.get("filenameSQL");\r
             getRecordsForSQL(sql, rh);\r
         }\r
     }\r