Browse code

URLencode blastSequence query

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/annotate@125378 bc3139a8-67e5-0310-9ffc-ced21a209358

Martin Morgan authored on 21/12/2016 17:08:27
Showing 3 changed files

... ...
@@ -1,6 +1,6 @@
1 1
 Package: annotate
2 2
 Title: Annotation for microarrays
3
-Version: 1.53.0
3
+Version: 1.53.1
4 4
 Author: R. Gentleman
5 5
 Description: Using R enviroments for annotation.
6 6
 Maintainer: Bioconductor Package Maintainer <maintainer@bioconductor.org>
... ...
@@ -50,7 +50,8 @@ importFrom(stats,
50 50
 importFrom(utils,
51 51
            browseURL,
52 52
            compareVersion,
53
-           packageDescription)
53
+           packageDescription,
54
+           URLencode)
54 55
 
55 56
 importFrom(xtable,
56 57
            xtable)
... ...
@@ -84,7 +84,7 @@
84 84
 
85 85
 ## Using the REST-ish API described at
86 86
 ## http://www.ncbi.nlm.nih.gov/blast/Doc/node2.html
87
-blastSequences <- function(x,database="nr",
87
+blastSequences <- function(x, database="nr",
88 88
                            hitListSize="10",
89 89
                            filter="L",
90 90
                            expect="10",
... ...
@@ -109,7 +109,7 @@ blastSequences <- function(x,database="nr",
109 109
     
110 110
     ## assemble the query
111 111
     baseUrl <- "https://www.ncbi.nlm.nih.gov/blast/Blast.cgi"
112
-    query <- paste("QUERY=",as.character(x),"&DATABASE=",database,
112
+    query <- paste("QUERY=", URLencode(as.character(x)), "&DATABASE=",database,
113 113
                    "&HITLIST_SIZE=",hitListSize,"&FILTER=",filter,
114 114
                    "&EXPECT=",expect,"&PROGRAM=",program, sep="")
115 115
     url0 <- sprintf("%s?%s&CMD=Put", baseUrl, query)