fixed bug in indicator_metadata(IndicatorID = "All") --> Thanks Luke

ropensci · Jan 20, 2021 · ee0655c · ee0655c
1 parent 2b4a623
commit ee0655c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # fingertipsR 1.0.5.9000
 
 * fixed warning message for multiple IndicatorIDs passed to indicator_metadata()
+* fixed bug in indicator_metadata(IndicatorID = "All") - thanks Luke Bradley for pointing it out
 
 # fingertipsR 1.0.5 (2020-09-16)
 

diff --git a/R/indicator_metadata.R b/R/indicator_metadata.R
@@ -76,32 +76,31 @@ indicator_metadata <- function(IndicatorID = NULL,
         if (!(is.null(IndicatorID))) {
                 AllIndicators <- indicators(path = path)
 
-                if (length(IndicatorID) == 1) {
-                        if (IndicatorID == "All") {
+                if (identical(IndicatorID, "All")) {
                                 dataurl <- paste0(path, "indicator_metadata/csv/all")
                                 indicator_metadata <- dataurl %>%
                                         GET(use_proxy(ie_get_proxy_for_url(.), username = "", password = "", auth = "ntlm")) %>%
                                         content("parsed",
                                                 type = "text/csv",
                                                 encoding = "UTF-8",
                                                 col_types = types)
-                        } else if (sum(AllIndicators$IndicatorID %in% IndicatorID) == 0){
-                                stop("IndicatorID(s) do not exist, use indicators() to identify existing indicators")
-                        }
-                } else if (sum(AllIndicators$IndicatorID %in% IndicatorID) == 0){
+
+                } else if (sum(AllIndicators$IndicatorID %in% IndicatorID) == 0) {
                         stop("IndicatorID(s) do not exist, use indicators() to identify existing indicators")
+                } else {
+                        path <- paste0(path, "indicator_metadata/csv/by_indicator_id?indicator_ids=")
+                        dataurl <- paste0(path,
+                                          paste(IndicatorID, collapse = "%2C"))
+                        if (!(is.null(ProfileID)) & length(ProfileID == 1))
+                                dataurl <- paste0(dataurl, "&profile_id=", ProfileID)
+                        indicator_metadata <- dataurl %>%
+                                GET(use_proxy(ie_get_proxy_for_url(.), username = "", password = "", auth = "ntlm")) %>%
+                                content("parsed",
+                                        type = "text/csv",
+                                        encoding = "UTF-8",
+                                        col_types = types)
                 }
-                path <- paste0(path, "indicator_metadata/csv/by_indicator_id?indicator_ids=")
-                dataurl <- paste0(path,
-                                  paste(IndicatorID, collapse = "%2C"))
-                if (!(is.null(ProfileID)) & length(ProfileID == 1))
-                        dataurl <- paste0(dataurl, "&profile_id=", ProfileID)
-                indicator_metadata <- dataurl %>%
-                        GET(use_proxy(ie_get_proxy_for_url(.), username = "", password = "", auth = "ntlm")) %>%
-                        content("parsed",
-                                type = "text/csv",
-                                encoding = "UTF-8",
-                                col_types = types)
+
         } else if (!(is.null(DomainID))) {
                 AllProfiles <- profiles(path = path)
                 if (sum(AllProfiles$DomainID %in% DomainID) == 0){