Merge branch 'master' into sbt-build

phenoscape · Aug 2, 2017 · f18ce09 · f18ce09
2 parents 608a206 + 4dfcbbc
commit f18ce09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/org/obo/annotation/base/UserOntologyConfiguration.java b/src/main/java/org/obo/annotation/base/UserOntologyConfiguration.java
@@ -28,7 +28,7 @@ public class UserOntologyConfiguration implements OntologyConfiguration {
 			defaultSources.add(new OntologySource("Museum Collections", new URL("http://svn.code.sf.net/p/phenoscape/code/trunk/vocab/fish_collection_abbreviation.obo")));
 			defaultSources.add(new OntologySource("Phenotypic Qualities", new URL("http://purl.obolibrary.org/obo/pato.obo")));
 			defaultSources.add(new OntologySource("Spatial Ontology", new URL("http://purl.obolibrary.org/obo/bspo.obo")));
-			defaultSources.add(new OntologySource("Unit Ontology", new URL("http://unit-ontology.googlecode.com/svn/trunk/unit.obo")));
+			defaultSources.add(new OntologySource("Unit Ontology", new URL("http://purl.obolibrary.org/obo/uo.obo")));
 			defaultSources.add(new OntologySource("OBO Relations", new URL("http://purl.obolibrary.org/obo/ro.obo")));
 			// need this?
 			//defaultSources.add(new OntologySource("Gene Ontology", new URL("http://www.geneontology.org/ontology/obo_format_1_2/gene_ontology.1_2.obo")));

diff --git a/src/main/java/org/phenoscape/util/ProvisionalTermUtil.java b/src/main/java/org/phenoscape/util/ProvisionalTermUtil.java
@@ -76,13 +76,14 @@ public static List<OBOClass> getProvisionalTerms(OBOSession session) throws IOEx
 			for (int i = 0; i < termResults.length(); i++) {
 				final JSONObject provisionalTerm = termResults.getJSONObject(i);
 				// this check should be removed once Bioportal implements server-side filtering by creator
-				final String creator = provisionalTerm.getString("creator");
-				if (creator.equals(getUserID())) {
-					terms.add(createClassForProvisionalTerm(provisionalTerm, session));
+				if (!provisionalTerm.isNull("creator")) {
+					final String creator = provisionalTerm.getString("creator");
+					if (creator.equals(getUserID())) {
+						terms.add(createClassForProvisionalTerm(provisionalTerm, session));
+					}
 				}
 			}
 			return terms;
-
 		}
 	}