[HepData-svn] r1628 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: whalley
Date: Tue May 28 10:15:27 2013
New Revision: 1628

Log:
- changing name of jhepwork to ScaVis

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java

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	Wed May 15 11:20:21 2013	(r1627)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java	Tue May 28 10:15:27 2013	(r1628)
@@ -1,5 +1,4 @@
-package cedar.hepdata.webapp.pages;
-
+package cedar.hepdata.webapp.pages; 
 import cedar.hepdata.model.*;
 import cedar.hepdata.util.*;
 import cedar.hepdata.xml.*;
@@ -37,7 +36,7 @@
         parseBaseViewContext(context);
 
         // Handle pattern parsing separately
-        Pattern patt = Pattern.compile("\\A" + "(short|long|full|plain.txt|yoda|aida|pyroot.py|root|mpl|bdms|hepml|jhepwork.py|input|marcxml)" + "\\Z",
+        Pattern patt = 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 patt2 = Pattern.compile("\\A" + "(irn\\d+)" + "\\Z",Pattern.CASE_INSENSITIVE);
         String stype = "i";
@@ -58,7 +57,7 @@
         // Now handle the special formats (after parsing *all* context elements)
         String fmt = getQueryParam("format");
         if (fmt != null) {
-            if (fmt.equals("jhepwork.py")) return asJhepwork();
+            if (fmt.equals("scavis.py")) return asJhepwork();
             if (fmt.equals("hepml")) return asHepML();
             if (fmt.equals("marcxml")) return asMarcXML();
             if (fmt.equals("bdms")) return asBDMS();
@@ -93,7 +92,7 @@
     ///////////////////////////////////////////////
     //
     public Object getJhepworkContext() {
-        return formatContext("jhepwork.py");
+        return formatContext("scavis.py");
     }
     public StreamResponse asJhepwork() {
         Set<Dataset> ds = getDatasets();