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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Thu Jan 28 16:43:28 2016
New Revision: 1918

Log:
modifications for keywords

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.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	Wed Jan 27 15:02:35 2016	(r1917)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/Browsing.java	Thu Jan 28 16:43:28 2016	(r1918)
@@ -69,34 +69,40 @@
        else if(getQueryParam("keyword").equals("ref")){
            return "References";
        }
+       else if(getQueryParam("keyword").equals("key")){
+           return "Keywords";
+       }
        else{
            return "Nothing";
        }
     }
     public String  getSearchName(){
        if(getQueryParam("keyword").equals("is")){
-           return "re";
+           return "re$002b";
        }
        else if(getQueryParam("keyword").equals("fs")){
-           return "fsp";
+           return "fsp$002b";
        }
        else if(getQueryParam("keyword").equals("obs")){
-           return "obs";
+           return "obs$002b";
        }
        else if(getQueryParam("keyword").equals("reac")){
-           return "reac";
+           return "reac$002b";
        }
        else if(getQueryParam("keyword").equals("exp")){
-           return "exp";
+           return "exp$002b";
        }
        else if(getQueryParam("keyword").equals("de")){
-           return "exp";
+           return "exp$002b";
        }
        else if(getQueryParam("keyword").equals("auth")){
-           return "auth";
+           return "auth$002b";
        }
        else if(getQueryParam("keyword").equals("ref")){
-           return "ref";
+           return "ref$002b";
+       }
+       else if(getQueryParam("keyword").equals("key")){
+           return "";
        }
        else{
            return "Nothing";
@@ -149,6 +155,9 @@
        else if (getQueryParam("keyword").equals("ref")){
            q = _session.createSQLQuery("select distinct Description from PaperRefs order by Description");
        }
+       else if (getQueryParam("keyword").equals("key")){
+           q = _session.createSQLQuery("select distinct Keyword from DsKeywords order by Keyword");
+       }
        List <String> templist0 = new ArrayList();
        templist0 = q.list();
 
@@ -159,13 +168,14 @@
               int nlb = StringUtils.countMatches(templist0.get(i),"(");
                if(nlb == nrb) {
 //              String temp = templist0.get(i);
-                  String temp = templist0.get(i).toUpperCase().replace('+','#').replace("#","$002b");
+                  String temp = templist0.get(i).toUpperCase().replace('+','#').replace("#","$002b").replace(" ","_");
                   temp = temp.replace('(','#').replace("#","$0028");
                   temp = temp.replace(')','#').replace("#","$0029");
                   temp = temp.replace('=','#').replace("#","$003d");
                   temp = temp.replace('*','#').replace("#","$002a");
                   temp = temp.replace('/','#').replace("#","$002f");
-//              System.out.println(" temp -- " + i);
+                  temp = temp.replace('|','#').replace("#","$007c");
+// //              System.out.println(" temp -- " + i);
                   templist.add(temp);
               }
            }

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 Jan 27 15:02:35 2016	(r1917)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/View.java	Thu Jan 28 16:43:28 2016	(r1918)
@@ -719,4 +719,58 @@
     public boolean getHaveCurrentPlot(){
         return saveplot.getHaveSaved();
     } 
+
+    public List <String> getKeywords(){
+        Paper p=getPaper();
+        return p.getKeywords();
+    }
+    private String _keyword;
+    public String getKeyword(){
+        if(_keyword==null) { return _keyword; }
+        else { return _keyword.replace(" ","_").replace('|','#').replace("#","$007c"); }
+    }
+    public void setKeyword(String keyword){
+        _keyword=keyword;
+    }
+    
+    public Set <String> getObservables(){
+        Paper p=getPaper();
+        List <String> observables = new ArrayList();
+        for (Dataset ds : p.getDatasets()){
+            for (String obs : ds.getDsObservables()){
+                observables.add(obs);
+            }
+        }
+        Set <String> uniqobs = new HashSet <String> (observables);
+        return uniqobs;  
+    }  
+    private String _observable;
+    public String getObservable(){
+        if(_observable==null) { return _observable; }
+        else { return _observable.replace(" ","_").replace('|','#').replace("#","$007c"); }
+    }
+    public void setObservable(String observable){
+        _observable=observable;
+    }
+    public Set <String> getReactions(){
+        Paper p=getPaper();
+        List <String> reactions = new ArrayList();
+        for (Dataset ds : p.getDatasets()){
+            for (String reac : ds.getDsReactions()){
+                reactions.add(reac);
+            }
+        }
+        Set <String> uniqreac = new HashSet <String> (reactions);
+        return uniqreac;  
+    }  
+    private String _reaction;
+    public String getReaction(){
+        if(_reaction==null) { return _reaction; }
+        else { return _reaction.replace(" ","_").replace('|','#').replace("#","$007c"); }
+    }
+    public void setReaction(String reaction){
+        _reaction=reaction;
+    }
+
+
 }