|
|
[HepData-svn] r1838 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/formats java/cedar/hepdata/webapp/components resources/cedar/hepdata/webapp/pages
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Thu Dec 4 16:56:26 GMT 2014
Author: watt
Date: Thu Dec 4 16:56:26 2014
New Revision: 1838
Log:
Add functions to display ModAction from PaperMods
Added:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperMods.java
Modified:
trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml
trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java Thu Dec 4 16:55:05 2014 (r1837)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java Thu Dec 4 16:56:26 2014 (r1838)
@@ -27,7 +27,11 @@
}
for (Modification mod : p.getModifications()){
- s.append("*status: Encoded "+mod.getComment()+" by "+mod.getModifier()+"\n");
+ if (mod.getAction()!=null) {
+ s.append("*status: "+mod.getAction()+" "+mod.getComment()+" by "+mod.getModifier()+"\n");
+ } else {
+ s.append("*status: Encoded "+mod.getComment()+" by "+mod.getModifier()+"\n");
+ }
}
for (Experiment exp : p.getExperiments()){
Added: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperMods.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperMods.java Thu Dec 4 16:56:26 2014 (r1838)
@@ -0,0 +1,60 @@
+package cedar.hepdata.webapp.components;
+
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.*;
+import cedar.hepdata.model.*;
+import java.util.*;
+
+public class DisplayPaperMods {
+
+ @BeginRender
+ void renderMessage(MarkupWriter writer) {
+
+ // Setup current paper element variables
+ if (_dataset != null) {
+ _paper = _dataset.getPaper();
+ }
+ if (_yaxis != null) {
+ _dataset = _yaxis.getDataset();
+ _paper = _dataset.getPaper();
+ }
+ if (_reaction != null) {
+ _yaxis = _reaction.getYAxis();
+ _dataset = _yaxis.getDataset();
+ _paper = _dataset.getPaper();
+ }
+
+ if (_paper != null) {
+ List <String> comarray = new ArrayList();
+ StringBuffer b = new StringBuffer();
+ writer.attributes("class","papermod");
+ int nc = 0;
+ for (Modification mod : _paper.getModifications()){
+ nc += 1;
+ if ( mod.getModifier() != null ) {
+ if (nc > 1) { writer.element("br"); writer.end(); }
+ if ( mod.getAction() != null ) {
+ writer.write(mod.getAction() + " " + mod.getComment() + " by " + mod.getModifier());
+ } else {
+ if (nc==1) { writer.write("Encoded " + mod.getComment() + " by " + mod.getModifier()); }
+ else { writer.write("Modified " + mod.getComment() + " by " + mod.getModifier()); }
+ }
+ }
+ }
+ }
+ }
+
+ @Parameter(name="p")
+ private Paper _paper;
+
+ @Parameter(name="ds")
+ private Dataset _dataset;
+
+ @Parameter(name="yax")
+ private YAxis _yaxis;
+
+ @Parameter(name="re")
+ private AxisReaction _reaction;
+
+}
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Thu Dec 4 16:55:05 2014 (r1837)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/AboutHepdata.tml Thu Dec 4 16:56:26 2014 (r1838)
@@ -22,6 +22,8 @@
<p/>
An overview of the HepData project was presented in a <a href="http://hepdata.cedar.ac.uk/resource/hepdata-aahep7.pdf">talk</a> (3 MB) at <a href="http://indico.cern.ch/event/aahep7/">AAHEP7</a> on 2nd April 2014.
<p/>
+The <a href="http://conference.ippp.dur.ac.uk/e/HepData2014">HepData advisory board kickoff meeting</a> was held on 12th November 2014.
+<p/>
</td>
</tr>
</table>
Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml Thu Dec 4 16:55:05 2014 (r1837)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml Thu Dec 4 16:56:26 2014 (r1838)
@@ -1,432 +1,444 @@
<!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">
-<head>
+ <head>
-<style type="text/css">
-.hidden{
- display: none;
-}
-</style>
-
-<script>
-function docwrite(x)
-{
- document.write(x);
-}
-</script>
-<!--
-<script type="text/javascript" src="http://hepdata.cedar.ac.uk/resource/HEPjax_test.js"></script>
--->
-<script type="text/javascript" src="http://hepdata.cedar.ac.uk/resource/HEPjax.js"></script>
-<script type="text/x-mathjax-config">
- MathJax.Hub.Config({
- tex2jax: {
+ <style type="text/css">
+ .hidden{
+ display: none;
+ }
+ </style>
+
+ <script>
+ function docwrite(x)
+ {
+ document.write(x);
+ }
+ </script>
+ <!--
+ <script type="text/javascript" src="http://hepdata.cedar.ac.uk/resource/HEPjax_test.js"></script>
+ -->
+ <script type="text/javascript" src="http://hepdata.cedar.ac.uk/resource/HEPjax.js"></script>
+ <script type="text/x-mathjax-config">
+ MathJax.Hub.Config({
+ tex2jax: {
inlineMath: [ ['$','$'], ["\\(","\\)"] ],
processEscapes: true
- }
- });
-</script>
-<script type="text/javascript"
- src="http://hepdata.cedar.ac.uk/resource/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-</script>
-<script type="text/javascript">
-function ExpandClicked(dom_element, expanded_url, expand_url){
- var startingPoint = dom_element.parentNode.parentNode.nextSibling;
+ }
+ });
+ </script>
+ <script type="text/javascript"
+ src="http://hepdata.cedar.ac.uk/resource/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+ </script>
+ <script type="text/javascript">
+ function ExpandClicked(dom_element, expanded_url, expand_url){
+ var startingPoint = dom_element.parentNode.parentNode.nextSibling;
- dom_element.src = (dom_element.src.indexOf(expanded_url) != -1) ? expand_url: expanded_url;
+ dom_element.src = (dom_element.src.indexOf(expanded_url) != -1) ? expand_url: expanded_url;
- while (startingPoint){
- if (startingPoint.className.indexOf("hidden") != -1){
+ while (startingPoint){
+ if (startingPoint.className.indexOf("hidden") != -1){
startingPoint.className = "";
- } else {
+ } else {
startingPoint.className += " hidden";
- }
- startingPoint = startingPoint.nextSibling;
- }
-
-}
-</script>
-<script language="javascript" type="text/javascript">
- function popitup(url){
- newwindow=window.open(url,'name','height=800,width=1000');
- if (window.focus){ newwindow.focus()}
- return false;
- }
-</script>
-
-</head>
-
-<body onLoad="replaceHEP('qualifier_class','observable_class','http://hepdata.cedar.ac.uk/resource/dictionary');">
-<t:if test="havePaper">
-
-<!--
-Try the systematics here:
-${paper.systematicsString}
--->
-
-<t:if test="longFormat">
- <h2> Reaction Database Full Record Display</h2>
- View
- <a href="#" t:type="pagelink" t:page="view" t:context="shortContext"><font size="-1">short record</font></a>
-<t:parameter name="else">
- <h2> Reaction Database Short Record Display</h2>
- View
- <a href="#" t:type="pagelink" t:page="view" t:context="baseContext"><font size="-1">full record</font></a>
-</t:parameter>
-</t:if>
- or as:
- <a href="#" t:type="pagelink" t:page="view" t:context="inputContext" title="Input format used to enter new records into the database (ideal format for new submissions)">input</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT,</a>
- <a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</a> or
- <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a>
+ }
+ startingPoint = startingPoint.nextSibling;
+ }
+
+ }
+ </script>
+ <script language="javascript" type="text/javascript">
+ function popitup(url){
+ newwindow=window.open(url,'name','height=800,width=1000');
+ if (window.focus){ newwindow.focus()}
+ return false;
+ }
+ </script>
+
+ </head>
+
+ <body onLoad="replaceHEP('qualifier_class','observable_class','http://hepdata.cedar.ac.uk/resource/dictionary');">
+ <t:if test="havePaper">
+
+ <!--
+ Try the systematics here:
+ ${paper.systematicsString}
+ -->
+
+ <t:if test="longFormat">
+ <h2> Reaction Database Full Record Display</h2>
+ View
+ <a href="#" t:type="pagelink" t:page="view" t:context="shortContext"><font size="-1">short record</font></a>
+ <t:parameter name="else">
+ <h2> Reaction Database Short Record Display</h2>
+ View
+ <a href="#" t:type="pagelink" t:page="view" t:context="baseContext"><font size="-1">full record</font></a>
+ </t:parameter>
+ </t:if>
+ or as:
+ <a href="#" t:type="pagelink" t:page="view" t:context="inputContext" title="Input format used to enter new records into the database (ideal format for new submissions)">input</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT,</a>
+ <a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</a> or
+ <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a>
-<t:if test="haveMultiple">
- <font size="+1">
- <p/>
- This record has multiple parts:
- <p/>
- <t:if test="haveMultiple2">
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper1Context"><b>Go to the 1st part of this record</b></a>
- <br/>
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper2Context"><b>Go to the 2nd part of this record</b></a>
- <br/>
- </t:if>
- <t:if test="haveMultiple3">
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper1Context"><b>Go to the 1st part of this record</b></a>
- <br/>
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper2Context"><b>Go to the 2nd part of this record</b></a>
- <br/>
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper3Context"><b>Go to the 3rd part of this record</b></a>
- <br/>
- </t:if>
- <t:if test="haveMultiple4">
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper1Context"><b>Go to the 1st part of this record</b></a>
- <br/>
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper2Context"><b>Go to the 2nd part of this record</b></a>
- <br/>
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper3Context"><b>Go to the 3rd part of this record</b></a>
- <br/>
- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper4Context"><b>Go to the 4th part of this record</b></a>
- <br/>
- </t:if>
- </font>
-</t:if>
- <title>HepData – ${paper.shortName}</title>
-
- <div class="paperbox">
- <h2 class="papertitle">
- <a href="#" t:type="pagelink" t:page="view" t:context="paperContext">${paper.shortName}</a>
- — ${paper.title}
- </h2>
-
- <t:if test="queryD">
- <h4>
- Showing only dataset(s): ${queryD}
- (<a href="#" t:type="pagelink" t:page="view" t:context="paperContext">show all</a>)
- </h4>
+ <t:if test="haveMultiple">
+ <font size="+1">
+ <p/>
+ This record has multiple parts:
+ <p/>
+ <t:if test="haveMultiple2">
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper1Context"><b>Go to the 1st part of this record</b></a>
+ <br/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper2Context"><b>Go to the 2nd part of this record</b></a>
+ <br/>
+ </t:if>
+ <t:if test="haveMultiple3">
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper1Context"><b>Go to the 1st part of this record</b></a>
+ <br/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper2Context"><b>Go to the 2nd part of this record</b></a>
+ <br/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper3Context"><b>Go to the 3rd part of this record</b></a>
+ <br/>
+ </t:if>
+ <t:if test="haveMultiple4">
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper1Context"><b>Go to the 1st part of this record</b></a>
+ <br/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper2Context"><b>Go to the 2nd part of this record</b></a>
+ <br/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper3Context"><b>Go to the 3rd part of this record</b></a>
+ <br/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="hdpaper4Context"><b>Go to the 4th part of this record</b></a>
+ <br/>
+ </t:if>
+ </font>
</t:if>
+ <title>HepData – ${paper.shortName}</title>
-
- <p>
- Experiment:
- <!-- <a href="http://slac.stanford.edu/cgi-bin/spiface/experiments/www2?fin+expt+${paper.experimentName}"> -->
- <a href="http://inspirehep.net/search?ln=en&cc=Experiments&p=119__a:${paper.experimentName}&of=hd" title="View ${paper.experimentname} entry in INSPIRE experiments database">
- <b>${paper.experimentName} (${paper.informalName})</b></a>
- <br/>
- <t:if test="paper.firstPublished">
- Published in <b>${paper.firstPublished}</b>
- <t:if test="paper.DOI">
- (DOI:<a href="http://dx.doi.org/${paper.DOI}">${paper.DOI}</a>)
+ <div class="paperbox">
+ <h2 class="papertitle">
+ <a href="#" t:type="pagelink" t:page="view" t:context="paperContext">${paper.shortName}</a>
+ — ${paper.title}
+ </h2>
+
+ <t:if test="queryD">
+ <h4>
+ Showing only dataset(s): ${queryD}
+ (<a href="#" t:type="pagelink" t:page="view" t:context="paperContext">show all</a>)
+ </h4>
+ </t:if>
+
+
+ <p>
+ Experiment:
+ <!-- <a href="http://slac.stanford.edu/cgi-bin/spiface/experiments/www2?fin+expt+${paper.experimentName}"> -->
+ <a href="http://inspirehep.net/search?ln=en&cc=Experiments&p=119__a:${paper.experimentName}&of=hd" title="View ${paper.experimentname} entry in INSPIRE experiments database">
+ <b>${paper.experimentName} (${paper.informalName})</b></a>
+ <br/>
+ <t:if test="paper.firstPublished">
+ Published in <b>${paper.firstPublished}</b>
+ <t:if test="paper.DOI">
+ (DOI:<a href="http://dx.doi.org/${paper.DOI}">${paper.DOI}</a>)
+ </t:if>
+ <br/>
</t:if>
- <br/>
- </t:if>
- <t:if test="paper.firstErratum">
- Erratum in <b>${paper.firstErratum}</b>
- <br/>
- </t:if>
- <t:if test="paper.firstPreprint">
- Preprinted as <b>${paper.firstPreprint}</b>
- <br/>
- </t:if>
- <t:if test="paper.secondPreprint">
- Preprinted as <b>${paper.secondPreprint}</b>
- <br/>
- </t:if>
- <t:if test="paper.archive">
- Archived as:
- <a href="http://arxiv.org/abs/${paper.archive}"><b>${paper.archive}</b></a>
- <br/>
- </t:if>
- <t:if test="paper.firstConference">
- Conference paper <b>${paper.firstConference}</b>
- <br/>
- </t:if>
- <t:if test="paper.firstAux">
- Auxiliary Material: <a href="${paper.firstAux}">${paper.firstAux}</a>
- <br/>
- </t:if>
- <t:if test="paper.inspireId">
- Record in:
- <a href="http://inspirehep.net/search?p=f+recid+${paper.inspireId}&search_action=Search" title="View the INSPIRE database record for this paper"><b>INSPIRE</b></a>
- <br/>
- </t:if>
- <t:if test="paper.cdsId">
- Record in:
- <a href=" http://cds.cern.ch/record/${paper.cdsId}"><b>CERN Document Server</b></a>
+ <t:if test="paper.firstErratum">
+ Erratum in <b>${paper.firstErratum}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.firstPreprint">
+ Preprinted as <b>${paper.firstPreprint}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.secondPreprint">
+ Preprinted as <b>${paper.secondPreprint}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.archive">
+ Archived as:
+ <a href="http://arxiv.org/abs/${paper.archive}"><b>${paper.archive}</b></a>
+ <br/>
+ </t:if>
+ <t:if test="paper.firstConference">
+ Conference paper <b>${paper.firstConference}</b>
+ <br/>
+ </t:if>
+ <t:if test="paper.firstAux">
+ Auxiliary Material: <a href="${paper.firstAux}">${paper.firstAux}</a>
+ <br/>
+ </t:if>
+ <t:if test="paper.inspireId">
+ Record in:
+ <a href="http://inspirehep.net/search?p=f+recid+${paper.inspireId}&search_action=Search" title="View the INSPIRE database record for this paper"><b>INSPIRE</b></a>
+ <br/>
+ </t:if>
+ <t:if test="paper.cdsId">
+ Record in:
+ <a href=" http://cds.cern.ch/record/${paper.cdsId}"><b>CERN Document Server</b></a>
+ <br/>
+ </t:if>
+ <t:if test="paper.haveRivet">
+ Rivet Analysis:
+ <a href="http://projects.hepforge.org/rivet/analyses#${paper.rivetName}"><b>${paper.rivetName}</b></a>
+ </t:if>
<br/>
- </t:if>
- <t:if test="paper.haveRivet">
- Rivet Analysis:
- <a href="http://projects.hepforge.org/rivet/analyses#${paper.rivetName}"><b>${paper.rivetName}</b></a>
- </t:if>
- <br/>
-<!--
- Version:${paper.version}
- <t:if test="isLatestVersion">
- (Latest)
- </t:if>
--->
- </p>
-
- <div class="papercomments">
- <t:displayPaperComments p="paper" />
- </div>
-
- <div class="extradata">
- <t:if test="haveExtraIRNDesc1">
- <a href="${showExtraIRNLink1}">${showExtraIRNDesc1}</a>
- </t:if>
- <t:if test="haveExtraIRNDesc2">
- <br/><a href="${showExtraIRNLink2}">${showExtraIRNDesc2}</a>
- </t:if>
- <t:if test="haveExtraIRNDesc3">
- <br/> <a href="${showExtraIRNLink3}">${showExtraIRNDesc3}</a>
- </t:if>
- <t:if test="haveExtraIRNDesc4">
- <br/><a href="${showExtraIRNLink4}">${showExtraIRNDesc4}</a>
- </t:if>
- <t:if test="haveExtraINSDesc1">
- <a href="${showExtraINSLink1}">${showExtraINSDesc1}</a>
- </t:if>
- <t:if test="haveExtraINSDesc2">
- <br/><a href="${showExtraINSLink2}">${showExtraINSDesc2}</a>
- </t:if>
- <t:if test="haveExtraINSDesc3">
- <br/> <a href="${showExtraINSLink3}">${showExtraINSDesc3}</a>
- </t:if>
- <t:if test="haveExtraINSDesc4">
- <br/><a href="${showExtraINSLink4}">${showExtraINSDesc4}</a>
- </t:if>
- <t:if test="haveExtraREDDesc1">
- <br/>
- <a href="${showExtraREDLink1}">${showExtraREDDesc1}</a>
- </t:if>
- <t:if test="haveExtraREDDesc2">
- <br/>
- <a href="${showExtraREDLink2}">${showExtraREDDesc2}</a>
- </t:if>
- <t:if test="haveExtraREDDesc3">
- <br/>
- <a href="${showExtraREDLink3}">${showExtraREDDesc3}</a>
- </t:if>
- <t:if test="haveExtraREDDesc4">
- <br/>
- <a href="${showExtraREDLink4}">${showExtraREDDesc4}</a>
- </t:if>
- <t:if test="haveExtraIRNDesc">
- <br/>
- <a href="/resource/${paper.spiresId}/index.shtml">${showExtraIRNDesc}</a>
- </t:if>
- <t:if test="haveExtraINSDesc">
- <br/>
- <a href="/resource/${paper.inspireId}/index.shtml">${showExtraINSDesc}</a>
- </t:if>
- <t:if test="haveExtraREDDesc">
- <br/>
- <a href="/resource/${paper.redId}/index.shtml">${showExtraREDDesc}</a>
- </t:if>
- </div>
-
- <t:displayHtmlInsert p="paper" />
-
- <p>
- <t:if test="haveCurrentPlot">
- <a href="/saveplot?list=all"
- title="Show the datasets which have been selected for combined plotting">View list of currently selected plots</a>
- <!-- <t:if test="searchquery"> -->
- <!-- | <a href="search?q=${searchquery}">Back to search...</a> -->
- <!-- </t:if> -->
- </t:if>
- </p>
+ <!--
+ Version:${paper.version}
+ <t:if test="isLatestVersion">
+ (Latest)
+ </t:if>
+ -->
+ </p>
+
+ <div class="papercomments">
+ <t:displayPaperComments p="paper" />
+ </div>
+
+ <div class="extradata">
+ <t:if test="haveExtraIRNDesc1">
+ <a href="${showExtraIRNLink1}">${showExtraIRNDesc1}</a>
+ </t:if>
+ <t:if test="haveExtraIRNDesc2">
+ <br/><a href="${showExtraIRNLink2}">${showExtraIRNDesc2}</a>
+ </t:if>
+ <t:if test="haveExtraIRNDesc3">
+ <br/> <a href="${showExtraIRNLink3}">${showExtraIRNDesc3}</a>
+ </t:if>
+ <t:if test="haveExtraIRNDesc4">
+ <br/><a href="${showExtraIRNLink4}">${showExtraIRNDesc4}</a>
+ </t:if>
+ <t:if test="haveExtraINSDesc1">
+ <a href="${showExtraINSLink1}">${showExtraINSDesc1}</a>
+ </t:if>
+ <t:if test="haveExtraINSDesc2">
+ <br/><a href="${showExtraINSLink2}">${showExtraINSDesc2}</a>
+ </t:if>
+ <t:if test="haveExtraINSDesc3">
+ <br/> <a href="${showExtraINSLink3}">${showExtraINSDesc3}</a>
+ </t:if>
+ <t:if test="haveExtraINSDesc4">
+ <br/><a href="${showExtraINSLink4}">${showExtraINSDesc4}</a>
+ </t:if>
+ <t:if test="haveExtraREDDesc1">
+ <br/>
+ <a href="${showExtraREDLink1}">${showExtraREDDesc1}</a>
+ </t:if>
+ <t:if test="haveExtraREDDesc2">
+ <br/>
+ <a href="${showExtraREDLink2}">${showExtraREDDesc2}</a>
+ </t:if>
+ <t:if test="haveExtraREDDesc3">
+ <br/>
+ <a href="${showExtraREDLink3}">${showExtraREDDesc3}</a>
+ </t:if>
+ <t:if test="haveExtraREDDesc4">
+ <br/>
+ <a href="${showExtraREDLink4}">${showExtraREDDesc4}</a>
+ </t:if>
+ <t:if test="haveExtraIRNDesc">
+ <br/>
+ <a href="/resource/${paper.spiresId}/index.shtml">${showExtraIRNDesc}</a>
+ </t:if>
+ <t:if test="haveExtraINSDesc">
+ <br/>
+ <a href="/resource/${paper.inspireId}/index.shtml">${showExtraINSDesc}</a>
+ </t:if>
+ <t:if test="haveExtraREDDesc">
+ <br/>
+ <a href="/resource/${paper.redId}/index.shtml">${showExtraREDDesc}</a>
+ </t:if>
+ </div>
+
+ <t:displayHtmlInsert p="paper" />
+
+ <p>
+ <t:if test="haveCurrentPlot">
+ <a href="/saveplot?list=all"
+ title="Show the datasets which have been selected for combined plotting">View list of currently selected plots</a>
+ <!-- <t:if test="searchquery"> -->
+ <!-- | <a href="search?q=${searchquery}">Back to search...</a> -->
+ <!-- </t:if> -->
+ </t:if>
+ </p>
- <t:if test="showSys">
- <t:if test="haveSys">
+ <t:if test="showSys">
+ <t:if test="haveSys">
<h4 class="datasettitle">
- Additional Systematic Errors and Comments
+ Additional Systematic Errors and Comments
</h4>
<div class="systematics">
- <t:displaySystematics p="paper" />
+ <t:displaySystematics p="paper" />
</div>
- </t:if>
- </t:if>
-
+ </t:if>
+ </t:if>
- <t:if test="isMultiPage">
- <p>
- Total number of tables: <b>${paper.datasets.size()}</b>.
- Displaying: <b>${counter}</b> to <b>${counterend}</b>.
- <a href="#" t:type="pagelink" t:page="view" t:context="firstcontext">First</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="prevcontext">Previous</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="nextcontext">Next</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="lastcontext">Last</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="allcontext">All</a>
- </p>
- </t:if>
- <t:loop source="datasetsnew" value="dataset">
- <t:if test="longFormat">
- <div>
- <div>
- <div class="datasetbox">
- <!-- <h3 class="datasettitle"> -->
- <p/>
- <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
- ( <t:displayDatasetLocation ds="dataset" /> )
- <!-- </h3> -->
- <img onClick="ExpandClicked(this,'${asset:context:button_expand.png}','${asset:context:button_hide.png}');"
- src ="${asset:context:button_hide.png}"/>
- <!-- <p class="altdsformats"> -->
- or as:
- <a href="#" t:type="pagelink" t:page="view" t:context="inputContext" title="Input format used to enter new records into the database (ideal format for new submissions)">input</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</a> or
- <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a>
- <!-- </p> -->
- <t:displayDatasetComments ds="dataset" />
-<!-- <t:datasetAsHtml dataset="dataset" format="${format}" /> -->
- </div>
- </div>
+ <t:if test="isMultiPage">
+ <p>
+ Total number of tables: <b>${paper.datasets.size()}</b>.
+ Displaying: <b>${counter}</b> to <b>${counterend}</b>.
+ <a href="#" t:type="pagelink" t:page="view" t:context="firstcontext">First</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="prevcontext">Previous</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="nextcontext">Next</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="lastcontext">Last</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="allcontext">All</a>
+ </p>
+ </t:if>
+ <t:loop source="datasetsnew" value="dataset">
+ <t:if test="longFormat">
<div>
<div>
- <table>
- <tr>
- <td valign="top">
- <t:datasetAsHtml dataset="dataset" format="${format}" />
- </td>
- <td valign="top">
- <t:if test="dataset.haveFigureIRN">
- <a href="http://hepdata.cedar.ac.uk/resource/${paper.spiresId}/fig${dataset.FigureString}.png">
- <img src="http://hepdata.cedar.ac.uk/resource/${paper.spiresId}/thumb_fig${dataset.FigureString}.png"/>
- </a>
- </t:if>
- <t:if test="dataset.haveFigureINS">
- <a href="http://hepdata.cedar.ac.uk/resource/${paper.inspireId}/fig${dataset.FigureString}.png">
- <img src="http://hepdata.cedar.ac.uk/resource/${paper.inspireId}/thumb_fig${dataset.FigureString}.png"/>
- </a>
- </t:if>
- <t:if test="dataset.haveFigureRED">
- <a href="http://hepdata.cedar.ac.uk/resource/${paper.redId}/fig${dataset.FigureString}.png">
- <img src="http://hepdata.cedar.ac.uk/resource/${paper.redId}/thumb_fig${dataset.FigureString}.png"/>
- </a>
- </t:if>
- </td>
- </tr>
- </table>
+ <div class="datasetbox">
+ <!-- <h3 class="datasettitle"> -->
+ <p/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
+ ( <t:displayDatasetLocation ds="dataset" /> )
+ <!-- </h3> -->
+ <img onClick="ExpandClicked(this,'${asset:context:button_expand.png}','${asset:context:button_hide.png}');"
+ src ="${asset:context:button_hide.png}"/>
+ <!-- <p class="altdsformats"> -->
+ or as:
+ <a href="#" t:type="pagelink" t:page="view" t:context="inputContext" title="Input format used to enter new records into the database (ideal format for new submissions)">input</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</a> or
+ <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a>
+ <!-- </p> -->
+ <t:displayDatasetComments ds="dataset" />
+ <!-- <t:datasetAsHtml dataset="dataset" format="${format}" /> -->
+
+ </div>
+ </div>
+ <div>
+ <div>
+ <table>
+ <tr>
+ <td valign="top">
+ <t:datasetAsHtml dataset="dataset" format="${format}" />
+ </td>
+ <td valign="top">
+ <t:if test="dataset.haveFigureIRN">
+ <a href="http://hepdata.cedar.ac.uk/resource/${paper.spiresId}/fig${dataset.FigureString}.png">
+ <img src="http://hepdata.cedar.ac.uk/resource/${paper.spiresId}/thumb_fig${dataset.FigureString}.png"/>
+ </a>
+ </t:if>
+ <t:if test="dataset.haveFigureINS">
+ <a href="http://hepdata.cedar.ac.uk/resource/${paper.inspireId}/fig${dataset.FigureString}.png">
+ <img src="http://hepdata.cedar.ac.uk/resource/${paper.inspireId}/thumb_fig${dataset.FigureString}.png"/>
+ </a>
+ </t:if>
+ <t:if test="dataset.haveFigureRED">
+ <a href="http://hepdata.cedar.ac.uk/resource/${paper.redId}/fig${dataset.FigureString}.png">
+ <img src="http://hepdata.cedar.ac.uk/resource/${paper.redId}/thumb_fig${dataset.FigureString}.png"/>
+ </a>
+ </t:if>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
</div>
- </div>
-
- <t:parameter name="else">
-
- <div>
- <div>
- <div class="datasetbox">
+
+ <t:parameter name="else">
+
+ <div>
+ <div>
+ <div class="datasetbox">
<!-- <h3 class="datasettitle"> -->
- <p/>
- <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
- ( <t:displayDatasetLocation ds="dataset" /> )
- <!-- </h3> -->
- <img onClick="ExpandClicked(this,'${asset:context:button_expand.png}','${asset:context:button_hide.png}');"
- src ="${asset:context:button_expand.png}"/>
- <!-- <p class="altdsformats"> -->
- or as:
- <a href="#" t:type="pagelink" t:page="view" t:context="inputContext" title="Input format used to enter new records into the database (ideal format for new submissions)">input</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a>,
- <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</a> or
- <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a>
- <!-- </p> -->
- <t:displayDatasetComments ds="dataset" />
- </div>
- </div><div class="hidden">
- <div><t:datasetAsHtml dataset="dataset" format="${format}" />
- </div>
- </div>
- </div>
-
- </t:parameter>
- </t:if>
-
-
- </t:loop>
- <t:if test="isMultiPage">
- <p>
- Total number of tables: <b>${paper.datasets.size()}</b>.
-<!-- Displaying: <b>${counter}</b> to <b>${counterend}</b>. -->
- <a href="#" t:type="pagelink" t:page="view" t:context="firstcontext">First</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="prevcontext">Previous</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="nextcontext">Next</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="lastcontext">Last</a> |
- <a href="#" t:type="pagelink" t:page="view" t:context="allcontext">All</a>
- </p>
- </t:if>
+ <p/>
+ <a href="#" t:type="pagelink" t:page="view" t:context="baseContext">Table ${dataset.id}</a>
+ ( <t:displayDatasetLocation ds="dataset" /> )
+ <!-- </h3> -->
+ <img onClick="ExpandClicked(this,'${asset:context:button_expand.png}','${asset:context:button_hide.png}');"
+ src ="${asset:context:button_expand.png}"/>
+ <!-- <p class="altdsformats"> -->
+ or as:
+ <a href="#" t:type="pagelink" t:page="view" t:context="inputContext" title="Input format used to enter new records into the database (ideal format for new submissions)">input</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="plainContext">plain text</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="aidaContext">AIDA</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="pyrootContext">PyROOT</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="yodaContext">YODA</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="rootContext">ROOT</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="matplotlibContext">mpl</a>,
+ <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</a> or
+ <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a>
+ <!-- </p> -->
+ <t:displayDatasetComments ds="dataset" />
+ </div>
+ </div><div class="hidden">
+ <div><t:datasetAsHtml dataset="dataset" format="${format}" />
+ </div>
+ </div>
+ </div>
+
+ </t:parameter>
+ </t:if>
+
+
+ </t:loop>
+ <t:if test="isMultiPage">
+ <p>
+ Total number of tables: <b>${paper.datasets.size()}</b>.
+ <!-- Displaying: <b>${counter}</b> to <b>${counterend}</b>. -->
+ <a href="#" t:type="pagelink" t:page="view" t:context="firstcontext">First</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="prevcontext">Previous</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="nextcontext">Next</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="lastcontext">Last</a> |
+ <a href="#" t:type="pagelink" t:page="view" t:context="allcontext">All</a>
+ </p>
+ </t:if>
+
+ </div>
+ <div class="permalinks">
+ <table width="100%">
+ <tr>
+ <td align="left">
+ Permalinks:
+ <!-- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaperContext">by HepData ID</a> -->
+ <t:if test="paper.spiresId">
+ | <a href="#" t:type="pagelink" t:page="view" t:context="spiresContext">by Spires ID</a>
+ </t:if>
+ <t:if test="paper.inspireId">
+ | <a href="#" t:type="pagelink" t:page="view" t:context="InspireContext">by Inspire ID</a>
+ </t:if>
+ <t:if test="paper.cdsId">
+ | <a href="#" t:type="pagelink" t:page="view" t:context="CdsContext">by CDS ID</a>
+ </t:if>
+ <t:if test="paper.DOI">
+ | <a href="http://hepdata.cedar.ac.uk/doidata/${paper.DOI}">by (journal) DOI</a>
+ </t:if>
+ <br/>
+ (Reaction db ID=${paper.id}, RED=${paper.redid})
+ </td>
+ <td align="center">
+ Last updated: ${paper.dateupdated}
+ </td>
+ <td align="right">
+ <div class="papermods">
+ <t:displayPaperMods p="paper" />
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
- </div>
- <p class="permalinks">
- Permalinks:
- <!-- <a href="#" t:type="pagelink" t:page="view" t:context="hdpaperContext">by HepData ID</a> -->
- <t:if test="paper.spiresId">
- | <a href="#" t:type="pagelink" t:page="view" t:context="spiresContext">by Spires ID</a>
- </t:if>
- <t:if test="paper.inspireId">
- | <a href="#" t:type="pagelink" t:page="view" t:context="InspireContext">by Inspire ID</a>
- </t:if>
- <t:if test="paper.cdsId">
- | <a href="#" t:type="pagelink" t:page="view" t:context="CdsContext">by CDS ID</a>
+ <t:parameter name="else">
+
+ <title>HepData paper view</title>
+ <h2>No valid paper could be found with the given ID/IRN</h2>
+
+ </t:parameter>
</t:if>
- <t:if test="paper.DOI">
- | <a href="http://hepdata.cedar.ac.uk/doidata/${paper.DOI}">by (journal) DOI</a>
- </t:if>
- <br/>
- (Reaction db ID=${paper.id}, RED=${paper.redid})
- <br/>
- (Last updated: ${paper.dateupdated})
- </p>
-
- <t:parameter name="else">
-
- <title>HepData paper view</title>
- <h2>No valid paper could be found with the given ID/IRN</h2>
-
- </t:parameter>
- </t:if>
-</body>
+ </body>
</html>
More information about the HepData-svn
mailing list
|