Merge pull request #30 from aberHRML/devel

Version 0.3.1
aberHRML · Nov 25, 2019 · ce83f9b · ce83f9b
2 parents 725d24a + e3e9397
commit ce83f9b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: classyfireR
 Type: Package
 Title: R Interface to the ClassyFire RESTful API
-Version: 0.3.0
-Date: 2019-11-18
+Version: 0.3.1
+Date: 2019-11-22
 Authors@R: c(
     person("Tom", "Wilson", , "tpw2@aber.ac.uk", c("aut", "cre"),  comment = c(ORCID = "0000-0003-3112-4682")),
     person("Jasen", "Finch", , "jsf9@aber.ac.uk", "aut"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# classyfireR 0.3.1
+
+* Add length checks in `get_classification` for when elements of the `json` output is missing (ie, no external descriptors present)
+
 # classyfireR 0.3.0
 
 * Use `S4` object orientation (OO) for storing and accessing results

diff --git a/R/get_classification.R b/R/get_classification.R
@@ -66,9 +66,19 @@ get_classification <- function(inchi_key)
         url = json_res$alternative_parents$url
       )
 
-    object@predicted_chebi <- json_res$predicted_chebi_terms
+    if(length(json_res$predicted_chebi_terms) > 0) {
+      object@predicted_chebi <- json_res$predicted_chebi_terms
+    }else{
+      object@predicted_chebi <- vector(mode = 'character')
+    }
+
+
+    if(length(json_res$external_descriptors) > 0) {
+      object@external_descriptors <- parse_external_desc(json_res)
+    }else{
+      object@external_descriptors <- tibble::tibble()
+    }
 
-    object@external_descriptors <- parse_external_desc(json_res)
 
     object@description <- json_res$description
 

diff --git a/inst/classyfireR-manual.pdf b/inst/classyfireR-manual.pdf