[HepData-svn] r1556 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats

[blackhole at projects.hepforge.org]

Author: whalley
Date: Thu Jun 28 12:40:48 2012
New Revision: 1556

Log:
a few tweaks

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/BdmsFormatter.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/BdmsFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/BdmsFormatter.java	Wed Jun 27 16:48:11 2012	(r1555)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/BdmsFormatter.java	Thu Jun 28 12:40:48 2012	(r1556)
@@ -106,7 +106,9 @@
                     String yheader = "";
                     if(yax.getHeader() != null){ 
                         yheader = yax.getHeader(); 
-                        storelist.add("N = YN;  V = " + yheader + ";\n");
+                        System.out.println("N = YN;  V = " + yheader + " ");
+                       if(n==nyax-1) { storelist.add("N = YN;  V = " + yheader + ";\n"); }
+                       else { storelist.add("N = YN;  V = " + yheader + ";"); }
                         nyhead=1;
                     }
                 

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java	Wed Jun 27 16:48:11 2012	(r1555)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/InputFormatter.java	Thu Jun 28 12:40:48 2012	(r1556)
@@ -17,26 +17,26 @@
     public static String format(Paper p) {
         if(p == null) return null;
 	    StringBuffer s = new StringBuffer();
-	    s.append("*author: " + p.getAuthors().first() + "\n");
+	    s.append("*author:\t" + p.getAuthors().first() + "\n");
 
         for (Reference ref : p.getReferences()){
-            s.append("*reference: "+ref.getDescription()+":"+ref.getDate()+"\n");
+            s.append("*reference:\t"+ref.getDescription()+":"+ref.getDate()+"\n");
         }
 
         for (Modification mod : p.getModifications()){
-            s.append("*status: Encoded "+mod.getComment()+" by "+mod.getModifier()+"\n");
+            s.append("*status:\tEncoded "+mod.getComment()+" by "+mod.getModifier()+"\n");
         }
 
         for (Experiment exp : p.getExperiments()){
-            s.append("*experiment: "+exp.getName()+"\n");
-            s.append("*detector: "+exp.getInformalName()+"\n");
+            s.append("*experiment:\t"+exp.getName()+"\n");
+            s.append("*detector:\t"+exp.getInformalName()+"\n");
         }
-        if(p.getSpiresId()!=null) s.append("*spiresId: " + p.getSpiresId() + "\n");
-        if(p.getInspireId()!=null) s.append("*inspireId: " + p.getInspireId() + "\n");
-        if(p.getRedId()!=null) s.append("*durhamId: " + p.getRedId() + "\n");
+        if(p.getSpiresId()!=null) s.append("*spiresId:\t" + p.getSpiresId() + "\n");
+        if(p.getInspireId()!=null) s.append("*inspireId:\t" + p.getInspireId() + "\n");
+        if(p.getRedId()!=null) s.append("*durhamId:\t" + p.getRedId() + "\n");
 
         for (String comment : p.getComments()){
-            s.append("*comment: "+comment+"\n");
+            s.append("*comment:\t"+comment+"\n");
         }
 
 
@@ -45,28 +45,28 @@
         
             s.append("\n*dataset:"+"\n");
             if(ds.getTfpString() != null){ 
-                s.append(ds.getTfpString().replace("TFP = L","*l").replace(";","") + "\n"); 
+                s.append(ds.getTfpString().replace("TFP = L","*l").replace(";","").replace(": ","\t") + "\n"); 
             }
             for (String comment : ds.getComments()){
                 if(!comment.startsWith("Location")){
-                    s.append("*dscomment: "+comment+"\n");
+                    s.append("*dscomment:\t"+comment+"\n");
                 }    
             }
             for (String re : ds.getDsReactions()){
-                s.append("*reackey: "+re+"\n");
+                s.append("*reackey:\t"+re+"\n");
             }
             for (String obs : ds.getDsObservables()){
-                s.append("*obskey: "+obs+"\n");
+                s.append("*obskey:\t"+obs+"\n");
             }
             for (String plab : ds.getDsPlabs()){
-                s.append("*obskey: "+plab+"\n");
+                s.append("*plabkey:\t"+plab+"\n");
             }
         
             for (DatasetError de : ds.getErrors()){
-                s.append("*Error: " + de.getPlus());
+                s.append("*Error:\t" + de.getPlus());
                 if(de.getNormType().toSymbol().equals("%")){s.append(" PCT");}
                 s.append(";\n");
-                s.append("ErrorComment: " + de.getComment() + ";\n");
+                s.append("ErrorComment:\t" + de.getComment() + ";\n");
             }
        
 
@@ -86,7 +86,7 @@
                 
                
                 for (Property prop : ds.getProperties()){
-                    s.append("*dsqual: "+prop.getName()+" :");
+                    s.append("*dsqual:\t"+prop.getName()+" :");
                     if(prop.getLowValue().equals(prop.getHighValue())){
                         s.append(" "+prop.getLowValue());  
                     } else{
@@ -106,7 +106,7 @@
                     String yheader = "";
                     if(yax.getHeader() != null){ 
                         yheader = yax.getHeader(); 
-                        storelist.add("*yheader: " + yheader);
+                        storelist.add("*yheader:\t" + yheader);
                         nyhead=1;
                     }
                 
@@ -115,7 +115,7 @@
                      	StringBuffer tempbuff = new StringBuffer();
                         String left = comm.split("\\s*:\\s*")[0];
                         String right = comm.split("\\s*:\\s*")[1];
-                        tempbuff.append("*qual: " + left + " : " + right);
+                        tempbuff.append("*qual:\t\t" + left + " : " + right);
                         storelist.add(tempbuff.toString());
                        } else{
                            nycomm =- 1;
@@ -124,7 +124,7 @@
                     for (Property prop : yax.getProperties()){
                         if(!prop.getName().startsWith("sqrts")){
                      	    StringBuffer tempbuff = new StringBuffer();
-                            tempbuff.append("*qual: " + prop.getName().trim());
+                            tempbuff.append("*qual:\t\t" + prop.getName().trim());
                             if(!prop.getUnit().toString().equals("num")) { tempbuff.append(" IN " + prop.getUnit().toString().toUpperCase()); } 
                             if(prop.getLowValue().equals(prop.getHighValue())){
                                 tempbuff.append(" : " + prop.getLowValue());
@@ -164,7 +164,7 @@
                              
                 s.append("*xheader");
                 for(XAxis xax : ds.getXAxes()){
-                    s.append(": " + xax.getHeader() + " ");
+                    s.append(":\t" + xax.getHeader() + " ");
                 }
                 s.append("\n");
                 s.append("*data");