Moved all data from data/ into inst/extdata and updated references

Examples/R/RQtTest2.R

@@ -2,7 +2,7 @@ library(RQt)
 t <- rqt.versionInfo()
 n <- rqt.appName()
 
-cnnString <- "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='Data\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true"
+cnnString <- "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='extdata\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true"
 bindingString <- "BIND b1 CONNECTION=cnn1 SCOPE=xdata_10, mydata1"
 st1String <- "SELECT FROM b1.0 INTO var3"
 st2String <- "SELECT USING INLINE avg(temperature) AS meanT, soilni as soilCategory FROM b1.0 INTO var4 ORDER BY meanT"

Examples/R/weatherR.R

@@ -2,7 +2,7 @@ library(ggplot2)
 library(scales)
 library(plyr)
 
-w2014 <- read.csv(file="data\\FSO2014_1.csv",head=TRUE,sep=",") # Hourly temperatures
+w2014 <- read.csv(file=system.file("extdata", "FSO2014_1.csv", package="RQt"),head=TRUE,sep=",") # Hourly temperatures
 w2014 <- w2014[w2014$TemperatureC !=-9999, ]
 
 w2014$shortdate <- strftime(w2014$DateUTC, format="%m-%d") # Extracts the date part only
@@ -12,4 +12,4 @@ meanTemp$shortdate <- as.Date(meanTemp$shortdate,format="%m-%d") # set the date
 
 ggplot(meanTemp, aes(shortdate, mean_T)) + geom_line() +
   scale_x_date(labels=date_format("%m/%d")) + xlab("") + ylab("Mean Temp deg C") +
-  ggtitle("2014 Average Daily Temperature at SFO")
+  ggtitle("2014 Average Daily Temperature at SFO")

Examples/processes/ex2.xqt

@@ -1,22 +1,22 @@
-CONNECTION cnn1 ADAPTER=CSV SOURCE_URI="data\\" PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true, externalHeader:true
+CONNECTION cnn1 ADAPTER=CSV SOURCE_URI="extdata\\" PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true, externalHeader:true
 
-BIND b1 CONNECTION=cnn1 SCOPE=data_10_time, fso2014h, xdata_10, mydata1 
+BIND b1 CONNECTION=cnn1 SCOPE=data_10_time, fso2014h, xdata_10, mydata1
 
 // there is an outleir in the data that should be fitered out. The refered filed is not in the perspective
-SELECT USING INLINE avg(TemperatureC) AS meanTemp, dt.dayofYear(DateUTC) as dayIndex FROM b1.1 
-INTO result1 
-WHERE  (TemperatureC <> -9999) 
+SELECT USING INLINE avg(TemperatureC) AS meanTemp, dt.dayofYear(DateUTC) as dayIndex FROM b1.1
+INTO result1
+WHERE  (TemperatureC <> -9999)
 ORDER BY dayIndex
 
 //SELECT FROM result1
-//INTO PLOT fsoPlot1 hax:dayIndex v-axis:meanTemp pt:l hl:"Day of Year" vl:"Mean Temperature (C)" pl:"Daily Mean Temperature at SFO in 2014"  
+//INTO PLOT fsoPlot1 hax:dayIndex v-axis:meanTemp pt:l hl:"Day of Year" vl:"Mean Temperature (C)" pl:"Daily Mean Temperature at SFO in 2014"
 
 // It is possible to combine both the queries into one by fusing the target clause
 
 /*
 SELECT USING INLINE avg(TemperatureC) AS meanTemp, dt.dayofYear(DateUTC) as dayIndex FROM b1.1
 //INTO temp1
-INTO PLOT fsoPlot2 hax:dayIndex v-axis:meanTemp pt:l hl:"Day of Year" vl:"Mean Temperature (C)" pl:"Daily Mean Temperature at SFO in 2014"  
+INTO PLOT fsoPlot2 hax:dayIndex v-axis:meanTemp pt:l hl:"Day of Year" vl:"Mean Temperature (C)" pl:"Daily Mean Temperature at SFO in 2014"
 WHERE  (TemperatureC <> -9999)//(dayIndex < 11)
 ORDER BY dayIndex
 */

R/RQt.R

@@ -94,11 +94,11 @@ rqt.getAdapterNames <- function(engine){
 #' @return the added script is returned. Usually the return value is not needed, but in case of debugging it may be useful.
 #' @examples
 #' engine1 <- rqt.getEngine()
-#' addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='data\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
+#' addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='extdata\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
 #'
 #' \dontrun{
 #' engine1 <- rqt.getEngine()
-#' addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='data\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
+#' addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='extdata\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
 #' }
 #'
 #' @export

man/rqt.addScript.Rd

@@ -22,11 +22,11 @@ the added script is returned. Usually the return value is not needed, but in cas
 }
 \examples{
 engine1 <- rqt.getEngine()
-addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='data\\\\\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
+addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='extdata\\\\\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
 
 \dontrun{
 engine1 <- rqt.getEngine()
-addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='data\\\\\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
+addedScript <- rqt.addScript(engine1, "CONNECTION cnn1 ADAPTER=CSV SOURCE_URI='extdata\\\\\\\\' PARAMETERS=delimiter:comma, fileExtension:csv, firstRowIsHeader:true")
 }
 }