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

[blackhole at projects.hepforge.org]

Author: watt
Date: Wed Mar  9 11:22:32 2016
New Revision: 1932

Log:
Change SCaVis output links to DMelt (request from S. Chekanov)

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java	Tue Mar  8 10:34:12 2016	(r1931)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java	Wed Mar  9 11:22:32 2016	(r1932)
@@ -42,7 +42,7 @@
         parseBaseViewContext(context);
 
         // Handle pattern parsing separately
-        Pattern patt = Pattern.compile("\\A" + "(short|long|full|plain.txt|yoda|yodastat|aida|pyroot.py|root|mpl|bdms|hepml|scavis.py|input|marcxml|json|yaml)" + "\\Z",
+        Pattern patt = Pattern.compile("\\A" + "(short|long|full|plain.txt|yoda|yodastat|aida|pyroot.py|root|mpl|bdms|hepml|dmelt.py|input|marcxml|json|yaml)" + "\\Z",
                                        Pattern.CASE_INSENSITIVE);
         Pattern patt2 = Pattern.compile("\\A" + "(irn\\d+)" + "\\Z",Pattern.CASE_INSENSITIVE);
         String stype = "i";
@@ -63,7 +63,7 @@
         // Now handle the special formats (after parsing *all* context elements)
         String fmt = getQueryParam("format");
         if (fmt != null) {
-            if (fmt.equals("scavis.py")) return asJhepwork();
+            if (fmt.equals("dmelt.py")) return asJhepwork();
             if (fmt.equals("hepml")) return asHepML();
             if (fmt.equals("marcxml")) return asMarcXML();
             if (fmt.equals("json")) return asJSON();
@@ -101,7 +101,7 @@
     ///////////////////////////////////////////////
     //
     public Object getJhepworkContext() {
-        return formatContext("scavis.py");
+        return formatContext("dmelt.py");
     }
     public StreamResponse asJhepwork() {
         Set<Dataset> ds = getDatasets();

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java	Tue Mar  8 10:34:12 2016	(r1931)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java	Wed Mar  9 11:22:32 2016	(r1932)
@@ -132,7 +132,7 @@
             }
 
 	    // G.W. 17/04/2014 More robust treatment of DOIs in URLs.
-	    Pattern patt1 = Pattern.compile("\\A" + "(short|long|full|plain.txt|yoda|aida|pyroot.py|root|mpl|bdms|hepml|scavis.py|input|marcxml)" + "\\Z", Pattern.CASE_INSENSITIVE);
+	    Pattern patt1 = Pattern.compile("\\A" + "(short|long|full|plain.txt|yoda|aida|pyroot.py|root|mpl|bdms|hepml|dmelt.py|input|marcxml)" + "\\Z", Pattern.CASE_INSENSITIVE);
 	    Pattern patt2 = Pattern.compile("\\A" + "d\\d+" + "\\Z", Pattern.CASE_INSENSITIVE);
 	    Pattern patt3 = Pattern.compile("\\A" + "(first|prev|next|last|all)" + "\\Z", Pattern.CASE_INSENSITIVE);
             m = Pattern.compile("\\A" + "10.1" + "\\d+\\Z").matcher(ps);

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml	Tue Mar  8 10:34:12 2016	(r1931)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/OutputHelp.tml	Wed Mar  9 11:22:32 2016	(r1932)
@@ -36,9 +36,9 @@
 <dt><b>AIDA</b><dd>Output in <a href="http://aida.freehep.org/">AIDA</a> (xml) format</dd></dt>
 <dt><b>PyROOT</b><dd>Output in <a href="http://root.cern.ch/drupal/content/pyroot">PyROOT</a> format</dd></dt>
 <dt><b>YODA</b><dd>Output in <a href="http://yoda.hepforge.org/">YODA</a> format</dd></dt>
-<dt><b>ROOT</b><dd>Output in <a href="http://root.cern.ch/">ROOT</a> format</dd></dt>
+<dt><b>ROOT</b><dd>Output in <a href="http://root.cern.ch/cint">ROOT CINT</a> format</dd></dt>
 <dt><b>mpl</b><dd>Output in <a href="http://matplotlib.org/">matplotlib</a> format</dd></dt>
-<dt><b>ScaVis</b><dd>Output in <a href="http://jwork.org/scavis/">SCaVis</a> format</dd></dt>
+<dt><b>DMelt</b><dd>Output in <a href="http://jwork.org/dmelt/">DataMelt</a> format</dd></dt>
 <dt><b>MarcXML</b><dd>Output in <a href="http://www.loc.gov/standards/marcxml/">MARCXML</a> format</dd></dt>
 <dt><b>YAML</b><dd>Output in <a href="http://yaml.org/">YAML</a> format (native format for new <a href="http://hepdata.net/">hepdata.net</a> site)</dd></dt>
 </dl>

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	Tue Mar  8 10:34:12 2016	(r1931)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Wed Mar  9 11:22:32 2016	(r1932)
@@ -83,7 +83,7 @@
       <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>,  
+      <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">DMelt</a>,  
       <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a> or
       <a href="#" t:type="pagelink" t:page="view" t:context="yamlContext">YAML</a> 
 
@@ -317,7 +317,7 @@
 		  <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>, 
+		  <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">DMelt</a>, 
 		  <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a> or
 		  <a href="#" t:type="pagelink" t:page="view" t:context="yamlContext">YAML</a> 
 		  <!-- </p> -->
@@ -377,7 +377,7 @@
 		    <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>, 
+		    <a href="#" t:type="pagelink" t:page="view" t:context="jhepworkContext">DMelt</a>, 
 		    <a href="#" t:type="pagelink" t:page="view" t:context="marcXMLContext">MarcXML</a> or
 		    <a href="#" t:type="pagelink" t:page="view" t:context="yamlContext">YAML</a> 
 		    <!-- </p> -->