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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Fri Jun  1 10:42:15 2012
New Revision: 1549

Log:
allowing data value output as per Double.toString() method bystarting a dataset comment with VERBATIM

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

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	Thu May 31 11:00:11 2012	(r1548)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Fri Jun  1 10:42:15 2012	(r1549)
@@ -46,7 +46,9 @@
         // Output the table comment(CT) and location(TFP)
         writer.element("p");
         writer.attributes("class", "datasetcomments");
+        boolean verbatim = false;
         for (String comment : _dataset.getComments()) {
+            if(comment.startsWith("VERBATIM")){verbatim = true;}
             int ls=comment.length();
             while (ls>0){
                 int iend = ls;
@@ -502,7 +504,8 @@
                         int msd = val.getMSD();
                         if (msd <= 0) msd = 1;
 //                        if(allzero == sumzero) lsd = 0;
-                        writer.write(Formats.forms(pt2.getValue(),msd, -lsd));
+                        if (verbatim) { writer.write(pt2.getValue().toString().replaceAll("E","e")); }
+                        else{ writer.write(Formats.forms(pt2.getValue(),msd, -lsd)); }
 
 
                         if (pt2.getRelation() == Relation.EQUALS) {
@@ -516,7 +519,8 @@
                                     if (e.getNormType() == ErrorNorm.PCT) { lsd = vale.getLSD(); }
                                     msd = vale.getMSD();
                                     if (msd <= 0) msd = 1;
-                                    writer.write(Formats.forms(e.getPlus(), msd, -lsd));
+                                    if (verbatim) { writer.write(e.getPlus().toString().replaceAll("E","e")); }
+                                    else {writer.write(Formats.forms(e.getPlus(), msd, -lsd)); }
                                     writer.write(e.getNormType().toSymbol());
                                 } else if (e.isSymmetricReversed()) {
                                     vale = new SignificantFigures(e.getPlus());
@@ -524,6 +528,7 @@
                                     if (e.getNormType() == ErrorNorm.PCT) { lsd = vale.getLSD(); }
                                     msd = vale.getMSD();
                                     if (msd <= 0) msd = 1;
+                                    if (verbatim) { writer.write(e.getMinus().toString().replaceAll("E","e")); }
                                     writer.write(Formats.forms(e.getMinus(), msd, -lsd));
                                     writer.write(e.getNormType().toSymbol());
                                 } else {
@@ -534,7 +539,8 @@
                                     if (e.getNormType() == ErrorNorm.PCT) { lsd = vale.getLSD(); }
                                     msd = vale.getMSD();
                                     if (msd <= 0) msd = 1;
-                                    writer.write(Formats.forms(e.getPlus(), msd, -lsd));
+                                    if (verbatim) { writer.write(e.getPlus().toString().replaceAll("E","e")); }
+                                    else { writer.write(Formats.forms(e.getPlus(), msd, -lsd)); }
                                     writer.write(e.getNormType().toSymbol());
                                     vale = new SignificantFigures(e.getMinus());
                                     if(e.getPlus()<0.0){ writer.writeRaw(",+");}
@@ -544,7 +550,8 @@
                                     if (e.getNormType() == ErrorNorm.PCT) { lsd = vale.getLSD(); }
                                     msd = vale.getMSD();
                                     if (msd <= 0) msd = 1;
-                                    writer.write(Formats.forms(e.getMinus(), msd, -lsd));
+                                    if (verbatim) { writer.write(e.getMinus().toString().replaceAll("E","e")); }
+                                    else{ writer.write(Formats.forms(e.getMinus(), msd, -lsd)); }
                                     writer.write(e.getNormType().toSymbol());
                                 }
                                 if(!stype.equals("?")) writer.writeRaw(" (" + stype + ") ");

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	Thu May 31 11:00:11 2012	(r1548)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplayDatasetComments.java	Fri Jun  1 10:42:15 2012	(r1549)
@@ -17,6 +17,7 @@
 //            writer.element("p class='datasetcomment'");
             for (String comment : _dataset.getComments()){
                 if(!comment.startsWith("Location")){
+                    if(comment.startsWith("VERBATIM")){ comment=comment.substring(8); }
                     comment = comment.replace(">", ">");
                     comment = comment.replace("<", "<");
                     comment = comment.replace("& gt;", ">");