[HepData-svn] r1816 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/components resources/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: watt
Date: Wed Sep  3 12:33:19 2014
New Revision: 1816

Log:
Fix HTML display of location.  Update SubmittingData text.  Tidy links to output formats on short record.

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java	Wed Aug 13 15:14:14 2014	(r1815)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java	Wed Sep  3 12:33:19 2014	(r1816)
@@ -22,7 +22,7 @@
                     comment = comment.replace("<", "<");
                     comment = comment.replace("& gt;", ">");
                     comment = comment.replace("& lt;", "<");
-                    while (comment.length() > 1){
+                    while (comment.length() > 0){
                         int ip = comment.indexOf(". ");
                         if(ip < 0) {ip = comment.length();}
                         int printcom=1;

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml	Wed Aug 13 15:14:14 2014	(r1815)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/SubmittingData.tml	Wed Sep  3 12:33:19 2014	(r1816)
@@ -11,13 +11,11 @@
 <h2>Submitting Data to the Reaction 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 us at hepdata(at)projects.hepforge.org.
 <p/>
 The criterium 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 category.  If it is possible that data will change following peer review, it may be better to delay HepData submission until after journal acceptance.
 <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.  However, supplementary files of any format (.ps, .pdf, .root, .C, .slha, etc.) can be placed in a web directory linked from the main HepData record.
+Generally we require only a flat file containing the numerical values.  Postscript and pdf figures are not suitable.  However, supplementary files of any format (.ps, .pdf, .root, .C, .slha, etc.) can be placed in a web directory linked from the main HepData record.
 <p/>
 Any text files you send us will be processed into a standard format, which can be seen from the "input" link on any of the existing records.  Data submissions provided in text formats closer to the "input" format (<i>not</i> the "plain text" format) can therefore be entered more quickly into the database.  You can start by looking at the "input" file for an existing record that is similar to your submitted data.  An annotated <a href="http://hepdata.cedar.ac.uk/resource/sample.input">sample input file</a> is available, as is a <a href="http://hepdata.cedar.ac.uk/resource/6150.pl">Perl script</a> or <a href="http://hepdata.cedar.ac.uk/resource/6150.py">Python script</a> used to produce the "input" file from the <a href="http://hepdata.cedar.ac.uk/resource/zz.txt">original submission</a>.  Some nomenclature that is still used in practice is defined in the historical 1970s <a href="http://hepdata.cedar.ac.uk/resource/EncodingManual.pdf">encoding manual</a> (14 MB).  It is useful to pro
 vide key metadata for each table such as a caption, the process being considered (initial-state and final-state particles), important kinematic cuts, and headers for the x and y columns specifying the quantity with units.  Multiple x and y values can be given in the same row separated by semicolons and non-existent entries can be indicated by dashes "-".  Numerical values should be given with an appropriate and not excessive number of significant figures (in general, a maximum of 4), avoiding giving more decimal places for the errors than the central values.  An <a href="http://hepdata.cedar.ac.uk/resource-cgi/input">online form</a> is available to test data input.  Click on "Browse..." to select your input file, followed by "Upload" and "Process", then click "Display" for the first 10 tables, or "All" for the whole record.  Please note that this <a href="http://hepdata.cedar.ac.uk/resource-cgi/input">online form</a> is only for testing purposes, and the final submittal to HepData m
 ust still be done by email to hepdata(at)projects.hepforge.org.
 <p/>

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	Wed Aug 13 15:14:14 2014	(r1815)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Wed Sep  3 12:33:19 2014	(r1816)
@@ -342,8 +342,8 @@
           <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> or 
-          <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">ScaVis</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" />