removed SSL verification due to new dvn site certificate from 2013-06-27

Author: leeper

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dvn
-Version: 0.1
-Date: 2013-01-30
+Version: 0.2
+Date: 2013-06-30
 Title: Access to The Dataverse Network API
 Author: Thomas J. Leeper
 Maintainer: Thomas J. Leeper <[email protected]>

R/dvn.r

@@ -19,8 +19,9 @@ dvQuery <- function(verb, query = NULL, dv = "https://dvn.iq.harvard.edu/dvn/",
 		browseURL(url)
 	else{
 		xml <- getURL(url, followlocation = TRUE, 
-					ssl.verifypeer = TRUE, ssl.verifyhost = TRUE, 
-					cainfo = system.file("CurlSSL", "cacert.pem", package = "RCurl"))
+					#ssl.verifypeer = TRUE, ssl.verifyhost = TRUE,
+					ssl.verifypeer = FALSE, ssl.verifyhost = FALSE)
+					#cainfo = system.file("CurlSSL", "cacert.pem", package = "RCurl"))
 		return(xml)
 	}
 }
@@ -29,6 +30,8 @@ dvQuery <- function(verb, query = NULL, dv = "https://dvn.iq.harvard.edu/dvn/",
 
 dvSearchFields <- function(dv = "https://dvn.iq.harvard.edu/dvn/", browser=FALSE){
 	xml <- dvQuery(verb = "metadataSearchFields", query = NULL, dv = dv, browser=browser)
+	if(is.null(xml))
+		invisible(NULL)
 	if(browser==FALSE){
 		searchterms <- xpathApply(xmlParse(xml),"//SearchableField")
 		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
 			stop("Must specify query as named list or character string")
 	}
 	xml <- dvQuery(verb = "metadataSearch", query = query, dv = dv, browser=browser)
+	if(is.null(xml))
+		invisible(NULL)
 	if(browser==FALSE){
 		results <- xpathApply(xmlParse(xml),"//study")
 		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
 
 dvMetadataFormats <- function(objectid, dv = "https://dvn.iq.harvard.edu/dvn/", browser=FALSE){
 	xml <- dvQuery(verb = "metadataFormatsAvailable", query = objectid, dv = dv, browser=browser)
+	if(is.null(xml))
+		invisible(NULL)
 	if(browser==FALSE){
 		searchterms <- xpathApply(xmlParse(xml),"//formatAvailable")
 		if(length(searchterms)>0){
@@ -108,6 +115,8 @@ dvMetadata <- function(objectid, format.type=NULL, include=NULL, exclude=NULL,
 			query <- paste(query,"&partialExclude=",exclude,sep="")
 	}
 	xml <- dvQuery(verb = "metadata", query = query, dv = dv, browser=browser)
+	if(is.null(xml))
+		invisible(NULL)
 	if(browser==FALSE)
 		return(xml)
 }
@@ -134,6 +143,8 @@ dvDownloadInfo <- function(fileid, dv = "https://dvn.iq.harvard.edu/dvn/", brows
 	if(is.null(fileid))
 		stop("Must specify fileId")
 	xml <- dvQuery(verb = "downloadInfo", query = fileid, dv = dv, browser=browser)
+	if(is.null(xml))
+		invisible(NULL)
 	if(browser==FALSE){
 		details <- list()
 		services <- xpathApply(xmlParse(xml),"//accessService")
@@ -171,8 +182,10 @@ dvDownload <- function(fileid, query=NULL, dv = "https://dvn.iq.harvard.edu/dvn/
 	if(is.null(fileid))
 		stop("Must specify fileId")
 	direct <- dvDownloadInfo(fileid)
+	if(is.null(direct))
+		stop("downloadInfo unavailable")
 	if(direct$directAccess=="false")
-		stop("Data cannot be accessed directly (",direct$accessRestrictions,")...try using URI from dvExtractFileIds(dvMetadata())")
+		stop(direct$accessRestrictions,"\nData cannot be accessed directly...try using URI from dvExtractFileIds(dvMetadata())")
 	if(is.null(query)){
 		xml <- dvQuery(verb = "download", query = fileid, dv = dv, browser=browser)
 		return(xml)