[HepData-svn] r1717 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components

[blackhole at projects.hepforge.org]

Author: whalley
Date: Wed Nov 27 14:33:31 2013
New Revision: 1717

Log:
moving links to the resource directory from whalley to hepdata

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetComments.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayHtmlInsert.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperComments.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Wed Nov 27 14:30:44 2013	(r1716)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Wed Nov 27 14:33:31 2013	(r1717)
@@ -126,8 +126,8 @@
                 paperid = _dataset.getPaper().getInspireId();
             }
         }
-        String descname="/home/whalley/resource/"+paperid+"/description."+location;
-        String linkname="/home/whalley/resource/"+paperid+"/link."+location;
+        String descname="/home/hepdata/resource/"+paperid+"/description."+location;
+        String linkname="/home/hepdata/resource/"+paperid+"/link."+location;
         File descfile = new File(descname);
         if(descfile.exists()) {
            try{
@@ -246,7 +246,17 @@
                 writer.element("tr");
                 writer.element("td");
                 writer.attributes("colspan", nx);
-                writer.writeRaw(" ");
+                if(store[0][i].startsWith("RE")){
+                    writer.element("a");
+                    writer.attributes("href","/h3test/ReactionHelp");
+                    writer.attributes("onClick","return popitup(this)");
+                    writer.attributes("title","click for more help on this reaction");
+                    writer.writeRaw("?=>");
+                    writer.end();
+                }
+                else{
+                    writer.writeRaw(" ");
+                }
                 writer.end();
 
 // this is the actual output

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetComments.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetComments.java	Wed Nov 27 14:30:44 2013	(r1716)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetComments.java	Wed Nov 27 14:33:31 2013	(r1717)
@@ -38,11 +38,11 @@
             }
             String bs = b.toString();
             int ls=bs.length();
-            System.out.println(bs + " " + ls);
+//           System.out.println(bs + " " + ls);
             while (ls>0){
                 int iend = ls;
                 int ihash = bs.indexOf("#");
-              System.out.println("ihash "+ihash+" iend " + ls);
+//              System.out.println("ihash "+ihash+" iend " + ls);
                
                 if(ihash>=0) { iend = ihash; }
                 writer.element("br"); writer.end();

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java	Wed Nov 27 14:30:44 2013	(r1716)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetLocation.java	Wed Nov 27 14:33:31 2013	(r1717)
@@ -38,11 +38,11 @@
             }
             String bs = b.toString();
             int ls=bs.length();
-            System.out.println(bs + " " + ls);
+//            System.out.println(bs + " " + ls);
             while (ls>0){
                 int iend = ls;
                 int ihash = bs.indexOf("#");
-              System.out.println("ihash "+ihash+" iend " + ls);
+//              System.out.println("ihash "+ihash+" iend " + ls);
                
                 if(ihash>=0) { iend = ihash; }
 //                writer.element("br"); writer.end();

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayHtmlInsert.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayHtmlInsert.java	Wed Nov 27 14:30:44 2013	(r1716)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayHtmlInsert.java	Wed Nov 27 14:33:31 2013	(r1717)
@@ -25,7 +25,7 @@
                 irn = _paper.getHepdataId();
             }
 
-	        String filename = "/home/whalley/resource/" + irn + "/insert.html";
+	        String filename = "/home/hepdata/resource/" + irn + "/insert.html";
 // 	    writer.write("Systematics from " + filename + " are:");
             try{
 	            BufferedReader in = new BufferedReader(new FileReader(filename));

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperComments.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperComments.java	Wed Nov 27 14:30:44 2013	(r1716)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayPaperComments.java	Wed Nov 27 14:33:31 2013	(r1717)
@@ -66,11 +66,11 @@
             //  new way
             String bs = b.toString();
             int ls=bs.length();
-            System.out.println(bs + " " + ls);
+//            System.out.println(bs + " " + ls);
             while (ls>0){
                 int iend = ls;
                 int ihash = bs.indexOf("#");
-              System.out.println("ihash "+ihash+" iend " + ls);
+//              System.out.println("ihash "+ihash+" iend " + ls);
                
                 if(ihash>=0) { iend = ihash; }
                 writer.element("br"); writer.end();