1. annotate
  2. Commit e690db1cd3dc3e1e0b9c3ee8d3901af6906357da
Browse code

missing NAMESPACE import

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

Martin Morgan authored on 19/07/2015 09:06:55
Showing 3 changed files
DESCRIPTION
History View file @ e690db1
... ... 
@@ -1,6 +1,6 @@
1 1 
 Package: annotate
2 2 
 Title: Annotation for microarrays
3 
-Version: 1.47.1
3 
+Version: 1.47.2
4 4 
 Author: R. Gentleman
5 5 
 Description: Using R enviroments for annotation.
6 6 
 Maintainer: Bioconductor Package Maintainer <maintainer@bioconductor.org>
NAMESPACE
History View file @ e690db1
... ... 
@@ -65,8 +65,9 @@ importFrom(XML,
65 65 
            xmlParse,
66 66 
            xmlRoot,
67 67 
            xmlTreeParse,
68 
+           xmlValue,
68 69 
            xpathApply,
69 
-           xmlValue)
70 
+           xpathSApply)
70 71
71 72 
 exportClasses(
72 73 
               chromLocation,
R/blastSequences.R
History View file @ e690db1
... ... 
@@ -35,7 +35,7 @@
35 35 
     start <- Sys.time()
36 36 
     end <- Sys.time() + timeout
37 37 
     repeat {
38 
-        dt <- as.double(end - Sys.time(), units="secs")
38 
+        dt <- max(1, as.double(end - Sys.time(), units="secs"))
39 39 
         Sys.sleep(min(rtoe, dt))
40 40 
         result <- tryCatch({
41 41 
             xmlParse(url, error = xmlErrorCumulator(immediate=FALSE))