X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FLogServlet.java;fp=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FLogServlet.java;h=8a1a4ba584e235434ff8734eff7898ded2613080;hb=efa3decef17b55b6ce8226c78c6d8327e0a41896;hp=eceab571458e9f8fbc5ab10a3100744a5433ed34;hpb=c50374709585766e887f349a139de0a6595c1ca1;p=dmaap%2Fdatarouter.git 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 eceab571..8a1a4ba5 100644 --- 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'"; private static final String FMT_2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; - private static boolean isfeedlog; + private boolean isfeedlog; public abstract class RowHandler { private final ServletOutputStream out; @@ -281,12 +281,14 @@ public class LogServlet extends BaseServlet { map.put("err", "bad type"); return map; } - } else + } else { map.put("type", "all"); + } map.put("publishSQL", ""); map.put("statusSQL", ""); map.put("resultSQL", ""); map.put("reasonSQL", ""); + map.put("filenameSQL", ""); s = req.getParameter("publishId"); if (s != null) { @@ -297,6 +299,11 @@ public class LogServlet extends BaseServlet { map.put("publishSQL", " AND PUBLISH_ID = '"+s+"'"); } + s = req.getParameter("filename"); + if (s != null) { + map.put("filenameSQL", " AND FILENAME = '"+s+"'"); + } + s = req.getParameter("statusCode"); if (s != null) { String sql = null; @@ -388,7 +395,7 @@ public class LogServlet extends BaseServlet { if (type.equals("all") || type.equals("pub")) { String sql = "select * from LOG_RECORDS where FEEDID = "+feedid + " AND TYPE = 'pub'" - + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL"); + + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL") + map.get("filenameSQL"); getRecordsForSQL(sql, rh); } }