fixes #2232

GMOD · Sep 26, 2019 · 2671b05 · 2671b05
1 parent 0802ed2
commit 2671b05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/grails-app/services/org/bbop/apollo/GpadHandlerService.groovy b/grails-app/services/org/bbop/apollo/GpadHandlerService.groovy
@@ -57,14 +57,8 @@ class GpadHandlerService {
         writeObject.out.write("\t")
         //5	Reference ::= ID		1	PMID:30695063
 //        writeObject.out.write(goAnnotation.notesArray)
-        if (goAnnotation.notesArray) {
-            JSONArray referenceArray = new JsonSlurper().parseText(goAnnotation.notesArray) as JSONArray
-            List<String> referenceList = referenceArray.collect()
-            writeObject.out.write(referenceList.join("|"))
-        }
-//        else{
-//            writeObject.out.write("")
-//        }
+        writeObject.out.write(goAnnotation.reference)
+        writeObject.out.write("\t")
         writeObject.out.write("\t")
         //6	Evidence_type ::= OBO_ID	Evidence and Conclusion Ontology	1	ECO:0000315
         writeObject.out.write(goAnnotation.evidenceRef)

diff --git a/src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java b/src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java
@@ -47,7 +47,7 @@ public class ExportPanel extends Modal {
     RadioButton peptideRadioButton = new RadioButton("Peptide", "Peptide", true);
     RadioButton chadoExportButton1 = new RadioButton("chadoExportOption1", "Export all sequences (that have annotations) to Chado", true);
     RadioButton chadoExportButton2 = new RadioButton("chadoExportOption2", "Export all sequences to Chado", true);
-    RadioButton gpadExportButton = new RadioButton("GPAD", "GPAD", true);
+    RadioButton gpadExportButton = new RadioButton("GPAD", "GPAD2", true);
 //    RadioButton jbrowseExportButton1 = new RadioButton("jbrowseExportButton1", "JSON Track", true);
 //    RadioButton jbrowseExportButton2 = new RadioButton("jbrowseExportButton2", "Annotations and Evidence", true);
 //    RadioButton jbrowseExportButton3 = new RadioButton("jbrowseExportButton3", "Add Track as Evidence", true);
@@ -350,4 +350,4 @@ public Boolean getExportToThisOrganism() {
     public Boolean getExportJBrowseSequence() {
         return exportJBrowseSequence;
     }
-}
+}