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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Thu Mar 13 12:14:35 2014
New Revision: 1761

Log:
fix problem of not published reference etcc...

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/MakeSummaryFromYAxes.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/MakeSummaryFromYAxes.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/MakeSummaryFromYAxes.java	Thu Mar 13 11:11:59 2014	(r1760)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/MakeSummaryFromYAxes.java	Thu Mar 13 12:14:35 2014	(r1761)
@@ -98,7 +98,10 @@
         for (YAxis ya : combinedplotadvanced.getYAxes()){
             for (YAxis ya2 : combinedplotadvanced.getYAxes()){
                 if(ya!=ya2){
-                    if(!ya2.getDataset().getPaper().getExperimentName().equals(ya.getDataset().getPaper().getExperimentName())) { same=false; }
+                    if(ya.getDataset().getPaper().getExperimentName()!=null && ya2.getDataset().getPaper().getExperimentName()!=null ){
+                        if(!ya2.getDataset().getPaper().getExperimentName().equals(ya.getDataset().getPaper().getExperimentName())) { same=false; }
+                    }
+                    else{ same=false; }
                 }      
             }      
         }
@@ -106,7 +109,10 @@
             int count=0;
             for (YAxis ya : combinedplotadvanced.getYAxes()){
                 writer.element("td");
-                if(++count==1){ writer.write(ya.getDataset().getPaper().getExperimentName());} 
+                if(ya.getDataset().getPaper().getExperimentName()!=null){
+                    if(++count==1){ writer.write(ya.getDataset().getPaper().getExperimentName());} 
+                    else{ writer.write(" "); }
+                }
                 else{ writer.write(" "); }
                 writer.end();
         //        writer.element("td"); writer.write("|"); writer.end(); ;
@@ -118,7 +124,10 @@
       //      writer.element("td"); writer.write("|"); writer.end(); ;
             for (YAxis ya : combinedplotadvanced.getYAxes()){
                 writer.element("td");
-                writer.write(ya.getDataset().getPaper().getExperimentName());
+                if(ya.getDataset().getPaper().getExperimentName()!=null){
+                    writer.write(ya.getDataset().getPaper().getExperimentName());
+                }
+                else{ writer.write(" "); }
                 writer.end();
       //          writer.element("td"); writer.write("|"); writer.end(); ;
             }
@@ -131,7 +140,13 @@
         for (YAxis ya : combinedplotadvanced.getYAxes()){
             for (YAxis ya2 : combinedplotadvanced.getYAxes()){
                 if(ya!=ya2){
-                    if(!ya2.getDataset().getPaper().getFirstPublished().equals(ya.getDataset().getPaper().getFirstPublished())) { same=false; }
+                    if(ya.getDataset().getPaper().getFirstPublished()!=null && ya2.getDataset().getPaper().getFirstPublished()!=null ){
+                        if(!ya2.getDataset().getPaper().getFirstPublished().equals(ya.getDataset().getPaper().getFirstPublished())) { same=false; }
+                    }
+                    else if (ya.getDataset().getPaper().getFirstPreprint()!=null && ya2.getDataset().getPaper().getFirstPreprint()!=null ){
+                         if(!ya2.getDataset().getPaper().getFirstPreprint().equals(ya.getDataset().getPaper().getFirstPreprint())) { same=false; }
+                    }
+                    else {same=false; } 
                 }      
             }      
         }
@@ -139,7 +154,15 @@
             int count=0;
             for (YAxis ya : combinedplotadvanced.getYAxes()){
                 writer.element("td");
-                if(++count==1){  writer.write(ya.getDataset().getPaper().getFirstPublished()); } 
+                if(++count==1){ 
+                    if(ya.getDataset().getPaper().getFirstPublished()!=null){
+                        writer.write(ya.getDataset().getPaper().getFirstPublished());
+                    }
+                    else if (ya.getDataset().getPaper().getFirstPreprint()!=null){ 
+                        writer.write(ya.getDataset().getPaper().getFirstPreprint());
+                    } 
+                    else{ writer.write(" "); }
+                } 
                 else{ writer.write(" "); }
                 writer.end();
         //        writer.element("td"); writer.write("|"); writer.end(); ;
@@ -152,7 +175,13 @@
     //        writer.element("td"); writer.write("|"); writer.end(); ;
             for (YAxis ya : combinedplotadvanced.getYAxes()){
                 writer.element("td");
-                writer.write(ya.getDataset().getPaper().getFirstPublished());
+                if(ya.getDataset().getPaper().getFirstPublished()!=null){
+                    writer.write(ya.getDataset().getPaper().getFirstPublished());
+                }
+                else if (ya.getDataset().getPaper().getFirstPreprint()!=null){
+                    writer.write(ya.getDataset().getPaper().getFirstPreprint());
+                }
+                else{ writer.write(" "); }
                 writer.end();
    //             writer.element("td"); writer.write("|"); writer.end(); ;
             }