Add files via upload

michalovadek · Sep 11, 2020 · fdb595b · fdb595b
1 parent d6a4e3e
commit fdb595b
Show file tree

Hide file tree

Showing 21 changed files with 155 additions and 64 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: eurlex
 Type: Package
 Title: Retrieve Data on European Union Law
-Version: 0.3.0
+Version: 0.3.1
 Authors@R: c(person(given = "Michal",
              family = "Ovadek",
              role = c("aut", "cre", "cph"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# eurlex 0.3.1
+
+## Minor changes
+
+- `elx_fetch_data()` now prefers CELEX-based URLs (instead of Cellar URIs) as input, as they appear to yield fewer missing documents
+
 # eurlex 0.3.0
 
 ## Major changes
@@ -12,6 +18,7 @@
 ## Minor changes
 
 - fixed serious bugs in `elx_curia_list()`
+- fixed bug in `elx_label_eurovoc()`
 
 # eurlex 0.2.2
 
@@ -23,4 +30,19 @@
 
 ## Minor changes
 
-- optimization, reduce dependencies, switch from XML to xml2, etc.
+- optimization, reducing dependencies, etc.
+
+# eurlex 0.2.0
+
+## Major changes
+
+- addition of proposals and national implementing laws to possible SPARQL queries
+- EuroVoc topics, retrievable in all EU languages, can now be included in SPARQL results
+- new date options (force, end of validity, transposition)
+- added `elx_curia_list()` to retrieve full list of EU court cases
+
+## Minor changes
+
+- switch from XML to xml2
+- SPARQL package dependency removed
+- cascading language options for `elx_fetch_data()`
diff --git a/R/elx_fetch_data.R b/R/elx_fetch_data.R
@@ -2,7 +2,7 @@
 #'
 #' Wraps httr::GET with pre-specified headers to retrieve data.
 #'
-#' @param url A valid url, preferably to a Cellar work obtained through `elx_run_query`.
+#' @param url A valid url based on a resource identifier such as CELEX or Cellar URI.
 #' @param type The type of data to be retrieved. When type = "text", the returned list contains named elements reflecting the source of each text.
 #' @param language_1 The priority language in which the data will be attempted to be retrieved, in ISO 639 2-char code
 #' @param language_2 If data not available in `language_1`, try `language_2`
@@ -11,7 +11,6 @@
 #' @export
 #' @examples
 #' \donttest{
-#' elx_fetch_data(url = ".../resource/cellar/3f7ccca4-478c-4a95-8778-df4243e30d0e", type = "text")
 #' elx_fetch_data(url = "http://publications.europa.eu/resource/celex/32014R0001", type = "title")
 #' }
 
@@ -85,7 +84,10 @@ elx_fetch_data <- function(url, type = c("title","text","ids"),
 
           multiout <- paste0(multiout, collapse = " ---documentbreak--- ")
 
-        } else {multiout <- NA_character_}
+        } else {
+          multiout <- NA_character_
+          names(multiout) <- "missingdoc"
+          }
 
       }
 
@@ -200,19 +202,3 @@ elx_read_text <- function(http_response){
 
 }
 
-# testing
-# dat <- eurlex::elx_make_query("proposal") %>% eurlex::elx_run_query()
-#
-# smpl <- sample_n(dat,100)
-#
-# new <- map(smpl$work,possibly(elx_fetch_data, otherwise = NA_character_),"text")
-# smpl[which(map((new),function(x) sum(is.na(x)))==1),3] %>% print(n=100)
-#
-# unlist(new) %>% enframe() %>% mutate(celex = smpl$celex) %>% filter(name=="multidocs") %>% print(n=150)
-#
-# multi_url <- smpl[43,1] %>% deframe()
-#
-# for (i in 150:nrow(smpl)){
-#   elx_fetch_data(smpl$work[i],"text")
-# }
-
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/eurlexpkg.html b/docs/articles/eurlexpkg.html
diff --git a/docs/articles/eurlexpkg_files/figure-html/wordcloud-1.png b/docs/articles/eurlexpkg_files/figure-html/wordcloud-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 1.5.1
 pkgdown_sha: ~
 articles:
   eurlexpkg: eurlexpkg.html
-last_built: 2020-09-10T00:16Z
+last_built: 2020-09-10T22:55Z
 
diff --git a/docs/reference/elx_council_votes.html b/docs/reference/elx_council_votes.html
diff --git a/docs/reference/elx_curia_list.html b/docs/reference/elx_curia_list.html