Author: [log in to unmask]
Date: Thu Feb 11 16:45:23 2016
New Revision: 4203
Log:
Show raw DAQ config strings only by their crate number; loading DAQConfig requires conditions manager setup which is static state and so should not be used in a servlet.
Modified:
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/TriggerConfigServlet.java
webapps/trunk/run-webapp/src/main/webapp/showTriggerConfig.jsp
Modified: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/TriggerConfigServlet.java
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/TriggerConfigServlet.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/TriggerConfigServlet.java Thu Feb 11 16:45:23 2016
@@ -25,27 +25,9 @@
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException,
- IOException {
-
+ IOException {
super.doGet(request, response);
-
- // Setup conditions system required by DAQ config builder classes (eek!).
- try {
- DatabaseConditionsManager.getInstance().setDetector("HPS-EngRun2015-Nominal-v3", getRun()); // eek!
- } catch (ConditionsNotFoundException e) {
- throw new RuntimeException(e);
- }
-
- // Build DAQ config.
- try {
- DAQConfig config = getRunManager().getDAQConfig();
- request.setAttribute("daqconfig", config);
- } catch (final Exception e) {
- throw new RuntimeException(e);
- }
-
cleanupRunManager();
-
final RequestDispatcher dispatcher = this.getServletContext().getRequestDispatcher("/showTriggerConfig.jsp");
dispatcher.forward(request, response);
}
Modified: webapps/trunk/run-webapp/src/main/webapp/showTriggerConfig.jsp
=============================================================================
--- webapps/trunk/run-webapp/src/main/webapp/showTriggerConfig.jsp (original)
+++ webapps/trunk/run-webapp/src/main/webapp/showTriggerConfig.jsp Thu Feb 11 16:45:23 2016
@@ -1,13 +1,39 @@
<%@page contentType="text/html"%>
+<%@page language="java" session="true"%>
<%@page import="java.util.*"%>
-<%@page language="java" session="true"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ page isELIgnored="false"%>
+<%@page import="org.hps.record.triggerbank.TriggerConfigData"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/sql" prefix="sql"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@page isELIgnored="false"%>
<html>
<body>
<div>
- <%=request.getAttribute("daqconfig").toString().replaceAll("\\r?\\n", "<br/>")%>
+ <sql:query dataSource="jdbc/hps_run_db_v2" var="result">
+ SELECT * FROM trigger_configs WHERE run = ?;
+ <sql:param value="${run}" />
+ </sql:query>
+ <c:set var="newline" value="<%= \"\n\" %>" />
+ <c:forEach var="row" items="${result.rows}">
+
+ <c:set var="config1" value="${fn:replace(row.config1, newline, '<br />')}" />
+ <h3>Crate <%=TriggerConfigData.Crate.values()[0].getCrateNumber()%></h3>
+ <c:out escapeXml="false" value="${config1}" />
+
+ <c:set var="config2" value="${fn:replace(row.config2, newline, '<br />')}" />
+ <h3>Crate <%=TriggerConfigData.Crate.values()[1].getCrateNumber()%></h3>
+ <c:out escapeXml="false" value="${config2}" />
+
+ <c:set var="config3" value="${fn:replace(row.config3, newline, '<br />')}" />
+ <h3>Crate <%=TriggerConfigData.Crate.values()[2].getCrateNumber()%></h3>
+ <c:out escapeXml="false" value="${config3}" />
+
+ <c:set var="config4" value="${fn:replace(row.config4, newline, '<br />')}" />
+ <h3>Crate <%=TriggerConfigData.Crate.values()[3].getCrateNumber()%></h3>
+ <c:out escapeXml="false" value="${config4}" />
+
+ </c:forEach>
</div>
</body>
-</html>
+</html>
