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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Tue Jan 28 14:59:47 2014
New Revision: 1735

Log:
adding optional comments to systematic error flags

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.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 Jan 16 15:28:20 2014	(r1734)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Tue Jan 28 14:59:47 2014	(r1735)
@@ -247,8 +247,8 @@
                 writer.element("tr");
                 writer.element("td");
                 writer.attributes("colspan", nx);
-                if(i==nprop+ncomm-1) { writer.attributes("class","xqualifier_last");}
-                else { writer.attributes("class","xqualifier"); }
+                if(i==nprop+ncomm-1) { writer.attributes("class","xqualifier_last qualifier_class");}
+                else { writer.attributes("class","xqualifier qualifier_class"); }
                 if(store[0][i].indexOf(" : ")>-1){ 
                     writer.write(store[0][i].substring(0,store[0][i].indexOf(" : ")));
                 }
@@ -285,9 +285,8 @@
                 if(same) {
                     writer.element("th");
                     writer.attributes("colspan",ny);
-                    if(i==nprop+ncomm-1) { writer.attributes("class","multiple qualifier_class"); }
-                    else { writer.attributes("class","multiple_not_last qualifier_class"); }
-                    writer.attributes("class","multiple qualifier_class");
+                    if(i<nprop+ncomm-1) { writer.attributes("class","multiple qualifier_class"); }
+                    else { writer.attributes("class","multiple_last qualifier_class"); }
                     if(store[0][i].indexOf(" : ")>-1) { 
                         writer.write(store[0][i].substring(store[0][i].indexOf(" : ")+2));
                     }
@@ -300,8 +299,8 @@
                     if(store[0][i].indexOf(":")>0) { ii = store[0][i].indexOf(":"); }
                     for (int nmy=0; nmy<ny; nmy++){
                         writer.element("th");
-                        if(i==nprop+ncomm-1) { writer.attributes("class","multiple qualifier_class"); } 
-                        else { writer.attributes("class","multiple_not_last qualifier_class"); } 
+                        if(i<nprop+ncomm-1) { writer.attributes("class","multiple qualifier_class"); } 
+                        else { writer.attributes("class","multiple_last qualifier_class"); } 
                         if(store[nmy][i] != null) {
                             if(nmy>0){ writer.write( store[nmy][i].substring(ii+1)); }
                        //     if(nmy<0){ writer.write( store[nmy][i].substring(ii+1)); }
@@ -631,11 +630,16 @@
                                     else{ writer.write(Formats.forms(e.getMinus(), msd, -lsd)); }
                                     writer.write(e.getNormType().toSymbol());
                                 }
-                                if(!stype.equals("?")) writer.writeRaw(" (" + stype + ") ");
+                                if(!stype.equals("?")) { writer.writeRaw(" (" + stype);
+                                     if(!e.getComment().equals("")) { 
+                                         writer.write("," + e.getComment()); 
+                                     }
+                                     writer.writeRaw(") ");
+                                }
                             }
                         }
                         for (PointError e : pt2.getErrors()){
-                            if(!e.getComment().equals("")) { writer.write(" (" + e.getComment() + ")"); }
+                            if(!e.getComment().equals("")&&!e.getSourceType().toShortString().equals("sys")) { writer.write(" (" + e.getComment() + ")"); }
                         }
                     }
                     catch (Exception e) {