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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Mon Mar  2 16:53:27 2015
New Revision: 1846

Log:
Fixes lower case (eg ratio) problem in observable list browsing

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

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Tue Feb 17 09:36:36 2015	(r1845)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Mon Mar  2 16:53:27 2015	(r1846)
@@ -154,12 +154,12 @@
 
        List <String> templist = new ArrayList();
        for (int i=0; i<templist0.size(); i++){
-           if(templist0.get(i) != null && templist0.get(i).matches("^[A-Z].*$")){
+           if(templist0.get(i) != null && templist0.get(i).matches("^[A-Za-z].*$")){
               int nrb = StringUtils.countMatches(templist0.get(i),")");
               int nlb = StringUtils.countMatches(templist0.get(i),"(");
                if(nlb == nrb) {
 //              String temp = templist0.get(i);
-                  String temp = templist0.get(i).replace('+','#').replace("#","$002b");
+                  String temp = templist0.get(i).toUpperCase().replace('+','#').replace("#","$002b");
                   temp = temp.replace('(','#').replace("#","$0028");
                   temp = temp.replace(')','#').replace("#","$0029");
                   temp = temp.replace('=','#').replace("#","$003d");