Changeset 20778

Timestamp:

03/03/10 11:55:09 (2 years ago)

Author:

rns

Message:

Fix GFF3 headers.

File:

• trunk/bio/webapp/src/org/intermine/bio/web/export/GFF3Exporter.java (modified) (4 diffs)

trunk/bio/webapp/src/org/intermine/bio/web/export/GFF3Exporter.java

@@ -77 +77 @@
     
     /**
-     * to read genome and modmine versions
+     * to read genome and project versions
      * @return header further info about versions
      */
     
-    public String getHeaderParts()
+    private String getHeaderParts()
     {
-        String header = null;
+        StringBuffer header = new StringBuffer();
 
         Properties props = PropertiesUtil.getProperties();
@@ -91 +91 @@
         
         if (fV != null && fV.length() > 0){
-            header = ", D. melanogaster genome v" + fV;
+            header.append(", D. melanogaster genome v" + fV);
         }
         if (wV != null && wV.length() > 0) {
-            header = header + ", C. elegans genome v" + wV;
+            header.append(", C. elegans genome v" + wV);
         }
         if (mV != null && mV.length() > 0) {
-            header = header + ", modMine r" + mV;
-        }
-        return header;
-    }
-
-    String HEADER = "##gff v3" + getHeaderParts();   
-    
-    
+            header.append(", " + this.sourceName + " " + mV);
+        }
+        return header.toString();
+    }
+
+    private String getHeader() {
+        return "##gff v3" + getHeaderParts();
+    }
+
     /**
      * {@inheritDoc}
@@ -152 +153 @@
                 // have a chromsome ref and chromosomeLocation ref
                 if (!headerPrinted) {
-                    out.println(HEADER);
+                    out.println(getHeader());
                     headerPrinted = true;
                 }
@@ -256 +257 @@
             // have a chromsome ref and chromosomeLocation ref
             if (!headerPrinted) {
-                out.println(HEADER);
+                out.println(getHeader());
                 headerPrinted = true;
             }