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

[blackhole at projects.hepforge.org]

Author: watt
Date: Wed Jul 22 18:57:40 2015
New Revision: 1883

Log:
Updates to YAML formatter: write location of image files, condense YAML format so only one document per table

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

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java	Wed Jul  8 19:21:35 2015	(r1882)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java	Wed Jul 22 18:57:40 2015	(r1883)
@@ -33,13 +33,14 @@
 	for (Dataset d : ds){
 	    s.append("\n---\n"); 
 	    s.append(_metadataYAML(d)); // dataset information in _metadata
-	    s.append("data_file: data"+d.getId()+".yaml\n");
-	    s.append("additional_resources:\n");
-	}
-	for (Dataset d : ds){
-	    s.append("\n---\n");
+	    //s.append("data_file: data"+d.getId()+".yaml\n");
+	    //s.append("additional_resources:\n");
 	    s.append(_dataYAML(d)); // dataset information in _data
 	}
+	// for (Dataset d : ds){
+	//     s.append("\n---\n");
+	//     s.append(_dataYAML(d)); // dataset information in _data
+	// }
 
  	// finally finish off (at present does nothing!)
         s.append(_footerYAML());
@@ -185,7 +186,7 @@
         s.append("name: 'Table "+ds.getId()+"'\n");
         for (String ct : ds.getComments()){
             if(ct.startsWith("Location:")) { 
-                location = ct.replaceFirst("Location:","");
+                location = ct.replaceFirst("Location:","").replaceAll(" ","");
 		//    s.append("label: "+ct.replaceFirst("Location:","Data from")+" from: "+p.getTitle()+"\n"); 
                 s.append("label: '"+ct.replaceFirst("Location:","Data from")+"'\n"); 
             }
@@ -284,6 +285,25 @@
             s.append("]}\n");
         } 
 
+	// Write location of image files if present.
+	s.append("additional_resources:\n");
+	String[] ids = new String[3];
+	if(p.getSpiresId() != null ) { ids[0]=p.getSpiresId().toString(); } else { ids[0]=""; } 
+        if(p.getInspireId() != null ) { ids[1]=p.getInspireId().toString(); } else { ids[1]=""; } 
+        if(p.getRedId() != null ) { ids[2]=p.getRedId().toString(); } else { ids[2]=""; }
+	for(int j=0; j<ids.length; j++) {
+	    String imagefile = "/home/hepdata/resource/" +ids[j] + "/fig" + location + ".png";
+	    File testimage = new File(imagefile);
+	    if(testimage.exists()){
+		s.append(sp+"{location: '/resource/"+ids[j]+"/fig" + location + ".png', description: 'Image file'}\n");
+	    }
+	    String thumbfile = "/home/hepdata/resource/" +ids[j] + "/thumb_fig" + location + ".png";
+	    File testthumb = new File(thumbfile);
+	    if(testthumb.exists()){
+		s.append(sp+"{location: '/resource/"+ids[j]+"/thumb_fig" + location + ".png', description: 'Thumbnail image file'}\n");
+	    }
+	}
+
         return s.toString();
     }
 
@@ -297,7 +317,7 @@
         String location = "";
         Paper p = ds.getPaper();
        
-	s.append("name: 'Table "+ds.getId()+"'\n");
+	//s.append("name: 'Table "+ds.getId()+"'\n");
         s.append("independent_variables:\n");
         for (XAxis xax : ds.getXAxes()){
             String name=xax.getHeader();