[HepData-svn] r1609 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query

[blackhole at projects.hepforge.org]

Author: whalley
Date: Wed Dec 12 14:25:30 2012
New Revision: 1609

Log:
adding trunction to all reaction type searches

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java	Fri Dec  7 10:26:42 2012	(r1608)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/query/ConstructQueryPaper.java	Wed Dec 12 14:25:30 2012	(r1609)
@@ -781,7 +781,7 @@
             b.append(" where p.PAPER_ID=ds._paper_PAPER_ID");
             b.append(" and (dr.DsReactions like '");
             b.append(reaction);
-            b.append("'");
+            b.append("%'");
             
             if(!reaction.endsWith("%")){
                 List<String> fsp = new ArrayList();
@@ -795,14 +795,14 @@
                             if(fsp.size()==2
                                              &&n2!=n1){
                                  if(n1!=0&&n2!=1)
-                                 {b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+"'");}
+                                 {b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+"%'");}
                              } 
                              else{
                                 for(int n3=0; n3<fsp.size(); n3++){
                                     if(fsp.size()==3
                                                     &&n3!=n2&&n3!=n1
                                                     &&n2!=n1){
-                                    b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+"'");
+                                    b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+"%'");
                                     }
                                     else{
                                         for(int n4=0; n4<fsp.size(); n4++){
@@ -810,7 +810,7 @@
                                                                  &&n4!=n3&&n4!=n2&&n4!=n1
                                                                  &&n3!=n2&&n3!=n1
                                                                  &&n2!=n1){
-                                            b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+" "+fsp.get(n4)+"'");
+                                            b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+" "+fsp.get(n4)+"%'");
                                             }
                                             else{
                                                 for(int n5=0; n5<fsp.size(); n5++){
@@ -819,7 +819,7 @@
                                                                  &&n4!=n3&&n4!=n2&&n4!=n1
                                                                  &&n3!=n2&&n3!=n1
                                                                  &&n2!=n1){
-                                                    b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+" "+fsp.get(n4)+" "+fsp.get(n5)+"'");
+                                                    b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+" "+fsp.get(n4)+" "+fsp.get(n5)+"%'");
                                                     }
                                                     else{
                                                         for(int n6=0; n6<fsp.size(); n6++){
@@ -829,7 +829,7 @@
                                                                  &&n4!=n3&&n4!=n2&&n4!=n1
                                                                  &&n3!=n2&&n3!=n1
                                                                  &&n2!=n1){
-                                                            b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+" "+fsp.get(n4)+" "+fsp.get(n5)+" "+fsp.get(n6)+"'");
+                                                            b.append(" or dr.DsReactions like '"+is+" --> "+fsp.get(n1)+" "+fsp.get(n2)+" "+fsp.get(n3)+" "+fsp.get(n4)+" "+fsp.get(n5)+" "+fsp.get(n6)+"%'");
                                                             }
                                                         }
                                                     }