diff --git a/src/java/azkaban/webapp/servlet/HistoryServlet.java b/src/java/azkaban/webapp/servlet/HistoryServlet.java
index 97011d7..8ed0697 100644
--- a/src/java/azkaban/webapp/servlet/HistoryServlet.java
+++ b/src/java/azkaban/webapp/servlet/HistoryServlet.java
@@ -67,59 +67,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
}
}
- @Override
- protected void handlePost(HttpServletRequest req, HttpServletResponse resp, Session session) throws ServletException, IOException {
- if (hasParam(req, "action")) {
- String action = getParam(req, "action");
- if (action.equals("search")) {
- String searchTerm = getParam(req, "searchterm");
- if(!searchTerm.equals("") && !searchTerm.equals(".*")) {
- Page page = newPage(req, resp, session, "azkaban/webapp/servlet/velocity/historypage.vm");
- int pageNum = getIntParam(req, "page", 1);
- int pageSize = getIntParam(req, "size", 16);
-
- if (pageNum < 0) {
- pageNum = 1;
- }
-
- List<ExecutionReference> history = executorManager.getFlowHistory(".*", searchTerm, ".*", 0, DateTime.now().getMillis(), pageSize, (pageNum - 1)*pageSize, true);
- page.add("flowHistory", history);
- page.add("size", pageSize);
- page.add("page", pageNum);
- page.add("search_term", searchTerm);
-
- if (pageNum == 1) {
- page.add("previous", new PageSelection(1, pageSize, true, false));
- }
- page.add("next", new PageSelection(pageNum + 1, pageSize, false, false));
- // Now for the 5 other values.
- int pageStartValue = 1;
- if (pageNum > 3) {
- pageStartValue = pageNum - 2;
- }
-
- page.add("page1", new PageSelection(pageStartValue, pageSize, false, pageStartValue == pageNum));
- pageStartValue++;
- page.add("page2", new PageSelection(pageStartValue, pageSize, false, pageStartValue == pageNum));
- pageStartValue++;
- page.add("page3", new PageSelection(pageStartValue, pageSize, false, pageStartValue == pageNum));
- pageStartValue++;
- page.add("page4", new PageSelection(pageStartValue, pageSize, false, pageStartValue == pageNum));
- pageStartValue++;
- page.add("page5", new PageSelection(pageStartValue, pageSize, false, pageStartValue == pageNum));
- pageStartValue++;
-
- page.render();
- }
- else resp.sendRedirect(req.getRequestURL().toString());
- }
- else resp.sendRedirect(req.getRequestURL().toString());
- }
- else {
- resp.sendRedirect(req.getRequestURL().toString());
- }
- }
-
private void handleAJAXAction(HttpServletRequest req, HttpServletResponse resp, Session session) throws ServletException, IOException {
HashMap<String, Object> ret = new HashMap<String, Object>();
String ajaxName = getParam(req, "ajax");
@@ -174,6 +121,14 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
long endTime = getParam(req, "end").equals("") ? DateTime.now().getMillis() : DateTimeFormat.forPattern("MM/dd/yyyy").parseDateTime(getParam(req, "end")).getMillis();
history = executorManager.getFlowHistory(projRe, flowRe, userRe, beginTime, endTime, pageSize, (pageNum - 1)*pageSize, true);
}
+ else if(hasParam(req, "search")) {
+ String searchTerm = getParam(req, "searchterm");
+ if(!searchTerm.equals("") && !searchTerm.equals(".*")) {
+ history = executorManager.getFlowHistory(".*", searchTerm, ".*", 0, DateTime.now().getMillis(), pageSize, (pageNum - 1)*pageSize, true);
+ page.add("search_term", searchTerm);
+ }
+
+ }
else {
history = executorManager.getFlowHistory("", "", "", 0, 0, pageSize, (pageNum - 1)*pageSize, false);
}
@@ -290,4 +245,11 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
this.selected = selected;
}
}
+
+ @Override
+ protected void handlePost(HttpServletRequest req, HttpServletResponse resp,
+ Session session) throws ServletException, IOException {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/src/java/azkaban/webapp/servlet/IndexServlet.java b/src/java/azkaban/webapp/servlet/IndexServlet.java
index 6edf03d..1d0aea5 100644
--- a/src/java/azkaban/webapp/servlet/IndexServlet.java
+++ b/src/java/azkaban/webapp/servlet/IndexServlet.java
@@ -41,13 +41,25 @@ public class IndexServlet extends LoginAbstractAzkabanServlet {
@Override
protected void handleGet(HttpServletRequest req, HttpServletResponse resp, Session session) throws ServletException, IOException {
+
+ if(hasParam(req, "doaction")) {
+ if(getParam(req, "doaction").equals("search")) {
+ String searchTerm = getParam(req, "searchterm");
+
+ if(!searchTerm.equals("") && !searchTerm.equals(".*")) {
+ handleFilter(req, resp, session, searchTerm);
+ return;
+ }
+ }
+ }
+
User user = session.getUser();
ProjectManager manager = this.getApplication().getProjectManager();
Page page = newPage(req, resp, session, "azkaban/webapp/servlet/velocity/index.vm");
if (hasParam(req, "all")) {
List<Project> projects = manager.getProjects();
- page.add("allProjects", "true");
+ page.add("allProjects", "");
page.add("projects", projects);
}
else {
@@ -57,40 +69,33 @@ public class IndexServlet extends LoginAbstractAzkabanServlet {
page.render();
}
-
- @Override
- protected void handlePost(HttpServletRequest req, HttpServletResponse resp, Session session) throws ServletException, IOException {
- if (hasParam(req, "action")) {
- String action = getParam(req, "action");
- if (action.equals("search")) {
-
- String searchTerm = getParam(req, "searchterm");
-
- if(!searchTerm.equals("") && !searchTerm.equals(".*")) {
- User user = session.getUser();
- ProjectManager manager = this.getApplication().getProjectManager();
- Page page = newPage(req, resp, session, "azkaban/webapp/servlet/velocity/index.vm");
- if (hasParam(req, "all")) {
- //do nothing special if one asks for 'ALL' projects
- List<Project> projects = manager.getProjectsByRe(searchTerm);
- page.add("allProjects", "");
- page.add("projects", projects);
- page.add("search_term", searchTerm);
- }
- else {
- List<Project> projects = manager.getUserProjectsByRe(user, searchTerm);
- page.add("projects", projects);
- page.add("search_term", searchTerm);
- }
-
- page.render();
- }
- else resp.sendRedirect(req.getRequestURL().toString());
- }
- else resp.sendRedirect(req.getRequestURL().toString());
+
+ private void handleFilter(HttpServletRequest req, HttpServletResponse resp, Session session, String searchTerm) {
+ User user = session.getUser();
+ ProjectManager manager = this.getApplication().getProjectManager();
+ Page page = newPage(req, resp, session, "azkaban/webapp/servlet/velocity/index.vm");
+ if (hasParam(req, "all")) {
+ //do nothing special if one asks for 'ALL' projects
+ List<Project> projects = manager.getProjectsByRe(searchTerm);
+ page.add("allProjects", "");
+ page.add("projects", projects);
+ page.add("search_term", searchTerm);
}
else {
- resp.sendRedirect(req.getRequestURL().toString());
+ List<Project> projects = manager.getUserProjectsByRe(user, searchTerm);
+ page.add("projects", projects);
+ page.add("search_term", searchTerm);
}
+
+ page.render();
}
+
+ @Override
+ protected void handlePost(HttpServletRequest req, HttpServletResponse resp,
+ Session session) throws ServletException, IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
