[HepData-svn] r1302 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/components java/cedar/hepdata/webapp/pages resources/cedar/hepdata/webapp/pages
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Nov 4 09:18:01 GMT 2009
Author: whalley
Date: Wed Nov 4 09:18:01 2009
New Revision: 1302
Log:
adding missing file
Added:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/AboutHepdata.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SubmittingData.java
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml
Modified:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/EasySearch3.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java Thu Oct 29 15:47:00 2009 (r1301)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/WriteDsObservables.java Wed Nov 4 09:18:01 2009 (r1302)
@@ -40,16 +40,17 @@
// String dsreaction = getQueryParam("dsreaction");
+// String dsreaction = getQueryParam("initial") + " --> " + getQueryParam("final");
String dsreaction = getQueryParam("initial") + " --> " + getQueryParam("final");
int j = dsreaction.lastIndexOf("(");
if(j>0) {dsreaction = dsreaction.substring(0,j-1);}
System.out.println(dsreaction);
String dsreactionURL = "";
- dsreactionURL = dsreaction.replace(" ","$002b");
+ dsreactionURL = dsreaction.replace(" ","_");
System.out.println("dsreaction is " + dsreaction);
-// try{
-// dsreactionURL = URLEncoder.encode(dsreaction,"UTF-8");
-// } catch (Exception ex) {dsreactionURL = "failed";};
+ try{
+ dsreactionURL = URLEncoder.encode(dsreactionURL,"UTF-8");
+ } catch (Exception ex) {dsreactionURL = "failed";};
System.out.println("dsreactionURL is " + dsreactionURL);
Query q = null;
@@ -81,7 +82,7 @@
for ( String dsobs : _dsobservables ){
nc += 1;
count += 1;
- writer.element("a href='Search/dsreaction_" + dsreactionURL + "_and_dsobservable_" + dsobs + "'");
+ writer.element("a href='Search/dsreaction_" + dsreaction.replace(" ","_").replace(">","$003e").replace("/","$002f") + "_and_dsobservable_" + dsobs + "'");
writer.write(dsobs);
writer.end();
writer.write(" (" + _counts.get(nc) + ")");
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/AboutHepdata.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/AboutHepdata.java Wed Nov 4 09:18:01 2009 (r1302)
@@ -0,0 +1,12 @@
+package cedar.hepdata.webapp.pages;
+
+import java.util.Date;
+
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.*;
+import org.apache.tapestry5.services.*;
+
+
+public class AboutHepdata {
+}
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java Thu Oct 29 15:47:00 2009 (r1301)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SavePlot.java Wed Nov 4 09:18:01 2009 (r1302)
@@ -180,7 +180,10 @@
}
return saved;
}
-
+ public Boolean getHaveSaved(){
+ if(getSaved().size() > 0) { return true;}
+ else{ return false;}
+ }
private Paper _paper;
private Paper getPaper(){
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SubmittingData.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/SubmittingData.java Wed Nov 4 09:18:01 2009 (r1302)
@@ -0,0 +1,12 @@
+package cedar.hepdata.webapp.pages;
+
+import java.util.Date;
+
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.*;
+import org.apache.tapestry5.services.*;
+
+
+public class SubmittingData{
+}
Added: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Wed Nov 4 09:18:01 2009 (r1302)
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+
+<title>Durham REACTION DATABASE Search</title>
+
+<body class="reaction">
+ <div class="navbar">
+ <a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> •
+ <a id="nav-review" href="reviews">Data Reviews</a> •
+ <a id="nav-pdf" href="/pdfs">Parton Density Functions</a> •
+ <a id="nav-feedback" href="feedback">Feedback</a>
+ </div>
+
+<table>
+<tr>
+<td>
+
+<h2>About HepData</h2>
+<p/>
+The Durham HepData Project has for more than 25 years compiled the Reactions Database containing what can be loosly described as cross sections from HEP scattering experiments. The data comprise total and differential cross sections, structure functions, fragmentation functions, distribuitions of jet measures, polarisations, etc... from a wide range of interactions.
+They are all made publically available in the Reaction Data Database.
+<p/>
+HepData is funded by a grant from the STFC(UK) and is based at the IPPP at Durham University in the UK. The HepData team is very small comprising:
+<ul>
+<li> Database Manager (Dr Mike Whalley)</li>
+<li> Coding Assistant (Mrs Joanne Bentham)</li>
+</ul>
+
+
+</td>
+</tr>
+</table>
+
+ <div class="navbar_lower">
+ HepData also maintains the UK mirrors of:
+ <a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a>
+ &
+ <a href="http://durpdg.dur.ac.uk/lbl/">PDG</a>
+ </div>
+
+</body>
+
+</html>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/EasySearch3.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/EasySearch3.tml Thu Oct 29 15:47:00 2009 (r1301)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/EasySearch3.tml Wed Nov 4 09:18:01 2009 (r1302)
@@ -17,115 +17,6 @@
<t:writeDsObservables />
-<!--
-<table>
-<tr>
-<td valign='top'>
-<t:loop source="dsObservables" value="dsObservable">
- ${addObsCount()}
- <t:if t:test="isTen">
- </t:if>
- <t:writeDsObservable dsobservable="dsObservable"/>
- <a href="ReactionQuery?dsreaction=${getDsReactionURL()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
-</t:loop></td>
-</tr>
-</table>
--->
-<!--
-<table>
-<tr>
-<td valign='top'> <t:loop source="dsObservablesA" value="dsObservable">
- <a href="ReactionQuery?dsreaction=${getDsReaction()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
- </t:loop>
-</td>
-<td valign='top'> <t:loop source="dsObservablesB" value="dsObservable">
- <a href="ReactionQuery?dsreaction=${getDsReaction()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
- </t:loop>
-</td>
-<td valign='top'> <t:loop source="dsObservablesC" value="dsObservable">
- <a href="ReactionQuery?dsreaction=${getDsReaction()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
- </t:loop>
-</td>
-<td valign='top'> <t:loop source="dsObservablesD" value="dsObservable">
- <a href="ReactionQuery?dsreaction=${getDsReaction()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
- </t:loop>
-</td>
-<td valign='top'> <t:loop source="dsObservablesE" value="dsObservable">
- <a href="ReactionQuery?dsreaction=${getDsReaction()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
- </t:loop>
-</td>
-<td valign='top'> <t:loop source="dsObservablesF" value="dsObservable">
- <a href="ReactionQuery?dsreaction=${getDsReaction()}&dsobservable=${getDsObservable()}&plength=10&start=1">${getDsObservable()}</a><br/>
- </t:loop>
-</td>
-</tr>
-
-</table>
--->
-<!--
- <form method="GET" action="ReactionQuery">
-
- <input type="hidden" name="dsreaction" value="${getDsReaction()}" />
-
- <table>
- <tr>
- <td align='center' colspan='5'>
- <b> <font size='+1'>Easy Search Method - stage 3</font></b>
- </td>
- </tr>
- <tr>
- <td colspan='5'>
- The following <b>observables</b> exist for the reaction <b> ${getDsReaction()}</b><br/>
- </td>
- </tr>
-
- <tr>
- <t:if test="isDsObservablesA"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesA" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesB"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesB" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesC"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesC" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesD"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesD" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr><tr>
- <t:if test="isDsObservablesE"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesE" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesF"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesF" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesG"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesG" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesH"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesH" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr><tr>
- <t:if test="isDsObservablesI"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesI" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesJ"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesJ" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesK"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesK" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesL"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesL" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr><tr>
- <t:if test="isDsObservablesM"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesM" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesN"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesN" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesO"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesO" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesP"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesP" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr><tr>
- <t:if test="isDsObservablesQ"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesQ" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesR"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesR" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesS"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesS" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesT"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesT" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesU"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesU" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr><tr>
- <t:if test="isDsObservablesV"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesV" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesW"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesW" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesX"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesX" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- <t:if test="isDsObservablesY"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesY" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr><tr>
- <t:if test="isDsObservablesZ"> <td><select name='dsobservable' size='3'><t:loop source="dsObservablesZ" value="dsObservable"><option>${getDsObservable()}</option></t:loop></select></td></t:if>
- </tr>
-
- <tr>
- <td colspan="5">
- then press <input type="submit" value="START" />
- to begin the search, or <input type="reset" value="RESET" />
- </td>
- </tr>
- </table>
- <input type="hidden" name="plength" value="10" />
- <input type="hidden" name="start" value="1" />
-
- </form>
--->
Back to <a href="EasySearch1">EasySeach Stage 1</a>
<!-- <t:Credits /> -->
</body>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml Thu Oct 29 15:47:00 2009 (r1301)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SavePlot.tml Wed Nov 4 09:18:01 2009 (r1302)
@@ -36,6 +36,7 @@
<div class="datasetbox">
<table border='0' class="dataset">
<tr><th colspan='8' > Current list of selected plots </th><td align='center'>remove</td><td align='center'>summary</td></tr>
+ <t:if test="haveSaved">
<t:loop source="saved" value="save">
${addCount()}
<tr>
@@ -50,7 +51,11 @@
<td align='center'><a href='SavePlot?string=${getQueryString()}&remove=${getSave()}'>x</a></td>
<td align='center'><a href="DisplaySummary?string=${getSave()}" onClick="return popitup(this)">?</a></td>
</tr>
- </t:loop>
+ </t:loop>
+ <t:parameter t:name="else">
+ <tr><td colspan="8">There are no plots currently selected</td></tr>
+ </t:parameter>
+ </t:if>
</table>
</div>
<p/>
Added: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml Wed Nov 4 09:18:01 2009 (r1302)
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<title>Durham REACTION DATABASE Search</title>
+
+<body class="reaction">
+
+ <div class="navbar">
+ <a href="#" id="nav-reaction" t:type="pagelink" t:page="index">Reaction Database</a> •
+ <a id="nav-review" href="reviews">Data Reviews</a> •
+ <a id="nav-pdf" href="/pdfs">Parton Density Functions</a> •
+ <a id="nav-feedback" href="feedback">Feedback</a>
+ </div>
+
+<table>
+<tr>
+<td>
+
+<h2>Submitting Data to the Reactions Database</h2>
+<p/>
+
+The compilers of the Reaction Database regularly scan the archives and literature to locate suitable new data sets for inclusion in the database, often contacting the experiments directly to obtain the exact numerical data.
+<p/>
+If you have, or know of, data which you think should be in the database, then please email <a HREF='mailto:m.r.whalley at durham.ac.uk'> Mike Whalley </a> about this.
+<p/>
+The criteria for data to be included is that it be data of a publishable form and not preliminary data. Data from conferences often fall into the latter catagory.
+<p/>
+The format we accept data in is very wide and generally we require only a flat file containing the numerical values. Postscript and pdf figures are not suitable.
+
+
+</td>
+</tr>
+</table>
+
+ <div class="navbar_lower">
+ HepData also maintains the UK mirrors of:
+ <a href="http://durpdg.dur.ac.uk/spires/hep">SPIRES_HEP</a>
+ &
+ <a href="http://durpdg.dur.ac.uk/lbl/">PDG</a>
+ </div>
+
+</body>
+
+</html>
More information about the HepData-svn
mailing list
|