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

[blackhole at projects.hepforge.org]

Author: watt
Date: Thu Apr 17 17:11:01 2014
New Revision: 1787

Log:
Don't assign (first|prev|next|last|all) to DOI in ViewBase

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

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	Thu Apr 17 16:25:56 2014	(r1786)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/ViewBase.java	Thu Apr 17 17:11:01 2014	(r1787)
@@ -134,6 +134,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 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);
 	    if (m.matches() && i==0) {
 		String doi="";
@@ -141,7 +142,8 @@
 		    String ps1 = context.get(String.class, ii);
 		    Matcher m1 = patt1.matcher(ps1);
 		    Matcher m2 = patt2.matcher(ps1);
-		    if (!m1.matches() && !m2.matches()) {
+		    Matcher m3 = patt3.matcher(ps1);
+		    if (!m1.matches() && !m2.matches() && !m3.matches()) {
 			if(ii>i) { doi +=  "/"; }
 			doi += ps1;
 		    }