Skip to content
This repository was archived by the owner on May 10, 2022. It is now read-only.

Commit 1776bf0

Browse files
committed
removed SSL verification due to new dvn site certificate from 2013-06-27
1 parent 6d22c38 commit 1776bf0

File tree

5 files changed

+3939
-20
lines changed

5 files changed

+3939
-20
lines changed

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dvn
2-
Version: 0.1
3-
Date: 2013-01-30
2+
Version: 0.2
3+
Date: 2013-06-30
44
Title: Access to The Dataverse Network API
55
Author: Thomas J. Leeper
66
Maintainer: Thomas J. Leeper <[email protected]>

R/dvn.r

+16-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ dvQuery <- function(verb, query = NULL, dv = "https://dvn.iq.harvard.edu/dvn/",
1919
browseURL(url)
2020
else{
2121
xml <- getURL(url, followlocation = TRUE,
22-
ssl.verifypeer = TRUE, ssl.verifyhost = TRUE,
23-
cainfo = system.file("CurlSSL", "cacert.pem", package = "RCurl"))
22+
#ssl.verifypeer = TRUE, ssl.verifyhost = TRUE,
23+
ssl.verifypeer = FALSE, ssl.verifyhost = FALSE)
24+
#cainfo = system.file("CurlSSL", "cacert.pem", package = "RCurl"))
2425
return(xml)
2526
}
2627
}
@@ -29,6 +30,8 @@ dvQuery <- function(verb, query = NULL, dv = "https://dvn.iq.harvard.edu/dvn/",
2930

3031
dvSearchFields <- function(dv = "https://dvn.iq.harvard.edu/dvn/", browser=FALSE){
3132
xml <- dvQuery(verb = "metadataSearchFields", query = NULL, dv = dv, browser=browser)
33+
if(is.null(xml))
34+
invisible(NULL)
3235
if(browser==FALSE){
3336
searchterms <- xpathApply(xmlParse(xml),"//SearchableField")
3437
d <- data.frame(matrix(nrow=length(searchterms),ncol=2))
@@ -61,6 +64,8 @@ dvSearch <- function(query, dv = "https://dvn.iq.harvard.edu/dvn/", browser=FALS
6164
stop("Must specify query as named list or character string")
6265
}
6366
xml <- dvQuery(verb = "metadataSearch", query = query, dv = dv, browser=browser)
67+
if(is.null(xml))
68+
invisible(NULL)
6469
if(browser==FALSE){
6570
results <- xpathApply(xmlParse(xml),"//study")
6671
d <- data.frame(matrix(nrow=length(results),ncol=1))
@@ -74,6 +79,8 @@ dvSearch <- function(query, dv = "https://dvn.iq.harvard.edu/dvn/", browser=FALS
7479

7580
dvMetadataFormats <- function(objectid, dv = "https://dvn.iq.harvard.edu/dvn/", browser=FALSE){
7681
xml <- dvQuery(verb = "metadataFormatsAvailable", query = objectid, dv = dv, browser=browser)
82+
if(is.null(xml))
83+
invisible(NULL)
7784
if(browser==FALSE){
7885
searchterms <- xpathApply(xmlParse(xml),"//formatAvailable")
7986
if(length(searchterms)>0){
@@ -108,6 +115,8 @@ dvMetadata <- function(objectid, format.type=NULL, include=NULL, exclude=NULL,
108115
query <- paste(query,"&partialExclude=",exclude,sep="")
109116
}
110117
xml <- dvQuery(verb = "metadata", query = query, dv = dv, browser=browser)
118+
if(is.null(xml))
119+
invisible(NULL)
111120
if(browser==FALSE)
112121
return(xml)
113122
}
@@ -134,6 +143,8 @@ dvDownloadInfo <- function(fileid, dv = "https://dvn.iq.harvard.edu/dvn/", brows
134143
if(is.null(fileid))
135144
stop("Must specify fileId")
136145
xml <- dvQuery(verb = "downloadInfo", query = fileid, dv = dv, browser=browser)
146+
if(is.null(xml))
147+
invisible(NULL)
137148
if(browser==FALSE){
138149
details <- list()
139150
services <- xpathApply(xmlParse(xml),"//accessService")
@@ -171,8 +182,10 @@ dvDownload <- function(fileid, query=NULL, dv = "https://dvn.iq.harvard.edu/dvn/
171182
if(is.null(fileid))
172183
stop("Must specify fileId")
173184
direct <- dvDownloadInfo(fileid)
185+
if(is.null(direct))
186+
stop("downloadInfo unavailable")
174187
if(direct$directAccess=="false")
175-
stop("Data cannot be accessed directly (",direct$accessRestrictions,")...try using URI from dvExtractFileIds(dvMetadata())")
188+
stop(direct$accessRestrictions,"\nData cannot be accessed directly...try using URI from dvExtractFileIds(dvMetadata())")
176189
if(is.null(query)){
177190
xml <- dvQuery(verb = "download", query = fileid, dv = dv, browser=browser)
178191
return(xml)

0 commit comments

Comments
 (0)