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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Wed Jun 10 14:11:55 2015
New Revision: 1866

Log:
more tweaks with quotes

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 Jun 10 14:02:06 2015	(r1865)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/YamlFormatter.java	Wed Jun 10 14:11:55 2015	(r1866)
@@ -149,19 +149,16 @@
             }
         }
 
-        int count=0;
         if(p.getComments().size()>0){
             s.append("comment: | # preserve newlines\n");
             boolean first=true;
             for (String comment : p.getComments()){
-                comment=comment.replaceAll("'","''");
                 if(first){ 
-                    s.append(s4+"'"+comment.replaceAll("\n","\n    "));
+                    s.append(s4+comment.replaceAll("\n","\n    "));
                     first=false;
                 } else {
                     s.append(s4+comment.replaceAll("\n","\n    "));
                 }
-                if(++count==p.getComments().size())  { s.append("'"); }
                 s.append("\n");
             }
         }
@@ -192,21 +189,17 @@
         }
 
         boolean first=true;
-        int count=0;
         for (String ct : ds.getComments()){
-            count++;
             if(!ct.startsWith("Location:")) {
                 s.append("description: |\n");
                 if(first){
-                    s.append(s4+"'"+ct.replaceFirst("VERBATIM","").replaceAll(">",">").replaceAll("<","<").replaceAll("\n","\n    "));
+                    s.append(s4+ct.replaceFirst("VERBATIM","").replaceAll(">",">").replaceAll("<","<").replaceAll("\n","\n    "));
                     first=false;
                 } else {
                     s.append(s4+ct.replaceFirst("VERBATIM","").replaceAll(">",">").replaceAll("<","<").replaceAll("\n","\n    "));
                 }
-                if(count==ds.getComments().size()-1)  { s.append("'"); }
                 s.append("\n");
             }
-            else{++count;}
         }
         s.append("keywords:\n");
         if(ds.getDsReactions().size() > 0) {