From 3d315ba4ca61ddc436e3aa2b284a46eb0ae178f0 Mon Sep 17 00:00:00 2001
From: IgorRodchenkov <rodche@gmail.com>
Date: Mon, 2 Sep 2019 01:13:02 -0400
Subject: [PATCH] Minor update - set unif xref.db from data instead of using
 'MeSH 2013'

---
 pom.xml                                                     | 6 +++---
 .../java/org/ctdbase/converter/CTDChemicalConverter.java    | 6 +++---
 src/main/java/org/ctdbase/converter/CTDGeneConverter.java   | 2 +-
 .../org/ctdbase/converter/CTDInteractionConverterTest.java  | 3 ---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index eeac7ae..44f05d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>pathwaycommons</groupId>
     <artifactId>ctd-to-biopax</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <name>ctd-to-biopax</name>
 
     <description>
@@ -64,8 +64,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.5.1</version>
                     <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
+                        <source>1.8</source>
+                        <target>1.8</target>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/src/main/java/org/ctdbase/converter/CTDChemicalConverter.java b/src/main/java/org/ctdbase/converter/CTDChemicalConverter.java
index 74c5104..4cff2cf 100644
--- a/src/main/java/org/ctdbase/converter/CTDChemicalConverter.java
+++ b/src/main/java/org/ctdbase/converter/CTDChemicalConverter.java
@@ -36,7 +36,7 @@ public Model convert(InputStream inputStream) throws IOException {
                 2 - CasRN
                 3 - Definition
                 4 - ParentIDs (MESH:*)
-                5- TreeNumber
+                5 - TreeNumber
                 6 - ParentTreeNumber
                 7 - Synonyms (sep w/ |)
                 8 - DrugBank IDs
@@ -126,10 +126,10 @@ private RelationshipXref createDrugBankXref(Model model, String dbId) {
     }
 
     private UnificationXref createUnificationXrefFromId(Model model, String chemicalId) {
-        String[] tokens = chemicalId.split(":");
+        String[] tokens = chemicalId.split(":"); //length=2 always
         String uri = CtdUtil.sanitizeId("rxref_" + chemicalId + "_" + UUID.randomUUID());
         UnificationXref xref = create(UnificationXref.class, uri);
-        xref.setDb("MeSH 2013");
+        xref.setDb(tokens[0]); //mesh
         xref.setId(tokens[1]);
         model.add(xref);
         return xref;
diff --git a/src/main/java/org/ctdbase/converter/CTDGeneConverter.java b/src/main/java/org/ctdbase/converter/CTDGeneConverter.java
index d967e56..9f38d48 100644
--- a/src/main/java/org/ctdbase/converter/CTDGeneConverter.java
+++ b/src/main/java/org/ctdbase/converter/CTDGeneConverter.java
@@ -61,7 +61,7 @@ private EntityReference generateReference(
             2 - GeneID
             3 - AltGeneIDs
             4 - Synonyms
-            5- BioGRIDIds
+            5 - BioGRIDIds
             6 - PharmGKBs
             7 - UniProtIds
          */
diff --git a/src/test/java/org/ctdbase/converter/CTDInteractionConverterTest.java b/src/test/java/org/ctdbase/converter/CTDInteractionConverterTest.java
index 1cc5eb4..fe114fb 100644
--- a/src/test/java/org/ctdbase/converter/CTDInteractionConverterTest.java
+++ b/src/test/java/org/ctdbase/converter/CTDInteractionConverterTest.java
@@ -1,12 +1,9 @@
 package org.ctdbase.converter;
 
-import org.biopax.paxtools.io.SimpleIOHandler;
 import org.biopax.paxtools.model.Model;
 import org.biopax.paxtools.model.level3.*;
 import org.biopax.paxtools.trove.TProvider;
 import org.biopax.paxtools.util.BPCollections;
-import org.ctdbase.util.CtdUtil;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;