LISTSERV mailing list manager LISTSERV 16.5

Help for HPS-SVN Archives


HPS-SVN Archives

HPS-SVN Archives


HPS-SVN@LISTSERV.SLAC.STANFORD.EDU


View:

Message:

[

First

|

Previous

|

Next

|

Last

]

By Topic:

[

First

|

Previous

|

Next

|

Last

]

By Author:

[

First

|

Previous

|

Next

|

Last

]

Font:

Proportional Font

LISTSERV Archives

LISTSERV Archives

HPS-SVN Home

HPS-SVN Home

HPS-SVN  February 2016

HPS-SVN February 2016

Subject:

r4203 - in /webapps/trunk/run-webapp/src/main: java/org/hps/webapps/run/TriggerConfigServlet.java webapp/showTriggerConfig.jsp

From:

[log in to unmask]

Reply-To:

Notification of commits to the hps svn repository <[log in to unmask]>

Date:

Fri, 12 Feb 2016 00:45:25 -0000

Content-Type:

text/plain

Parts/Attachments:

Parts/Attachments

text/plain (95 lines)

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>

Top of Message | Previous Page | Permalink

Advanced Options


Options

Log In

Log In

Get Password

Get Password


Search Archives

Search Archives


Subscribe or Unsubscribe

Subscribe or Unsubscribe


Archives

November 2017
August 2017
July 2017
January 2017
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
December 2013
November 2013

ATOM RSS1 RSS2



LISTSERV.SLAC.STANFORD.EDU

Secured by F-Secure Anti-Virus CataList Email List Search Powered by the LISTSERV Email List Manager

Privacy Notice, Security Notice and Terms of Use