Skip to content

Commit 76c77a6

Browse files
committed
Using interactive() was not a good idea
It confused me a lot that all tests passed but going through a test manually failed!
1 parent 1f8589c commit 76c77a6

5 files changed

+20
-5
lines changed

R/getObservationRecordsFromEuLines.R

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ getObservationRecordsFromEuLines <- function(
1212
silent = TRUE
1313
)
1414

15+
dot.args <- list(...)
16+
#dot.args <- list() # for debugging!
17+
1518
if (kwb.utils::isTryError(observations)) {
1619
observations <- kwb.utils::callWith(
1720
extractObservationData,
1821
euLines = eu_lines,
1922
headerInfo = getHeaderInfo(eu_lines),
2023
header.info = header.info,
2124
file = file,
22-
if (interactive()) list() else list(...)
25+
dot.args
2326
)
2427
}
2528

R/getObservationsFromEuLines.R

+4-1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ readObservationsFromCsvText <- function(text, sep, dec, quote, colClasses, ...)
154154
colClasses <- colClasses[colNames]
155155
}
156156

157+
dot.args <- list(...)
158+
#dot.args <- list() # for debugging!
159+
157160
kwb.utils::callWith(
158161
utils::read.table,
159162
text = text,
@@ -164,7 +167,7 @@ readObservationsFromCsvText <- function(text, sep, dec, quote, colClasses, ...)
164167
blank.lines.skip = FALSE,
165168
stringsAsFactors = FALSE,
166169
colClasses = colClasses,
167-
if (interactive()) list() else list(...)
170+
dot.args
168171
)
169172
}
170173

R/readAndMergeEuCodedFiles.R

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ readAndMergeEuCodedFiles <- function(
3131
error.file = NULL
3232
)
3333
{
34+
dot.args <- list(...)
35+
#dot.args <- list() # for debugging!
36+
3437
# by setting simple.algorithm = FALSE we get unique column names, e.g. "ADE"
3538
# and "ADE.1"
3639
inspection.data.list <- kwb.utils::callWith(
@@ -39,7 +42,7 @@ readAndMergeEuCodedFiles <- function(
3942
dbg = dbg,
4043
name.convention = name.convention,
4144
simple.algorithm = FALSE,
42-
if (interactive()) list() else list(...)
45+
dot.args
4346
)
4447

4548
result <- mergeInspectionData(inspection.data.list)

R/readEuCodedFile.R

+4-1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ readEuCodedFile <- function(
102102
)
103103
)
104104

105+
dot.args <- list(...)
106+
#dot.args <- list() # for debugging!
107+
105108
observations <- run(
106109
"Extracting observation records",
107110
kwb.utils::callWith(
@@ -110,7 +113,7 @@ readEuCodedFile <- function(
110113
header.info = header.info,
111114
dbg = dbg,
112115
file = input.file,
113-
if (interactive()) list() else list(...)
116+
dot.args
114117
)
115118
)
116119

R/readEuCodedFiles.R

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ readEuCodedFiles <- function(
3333
"input file %d/%d: %s\n", i, length(input.files), input.file
3434
))
3535

36+
dot.args <- list(...)
37+
#dot.args <- list() # for debugging!
38+
3639
inspectionData <- try(silent = TRUE, kwb.utils::callWith(
3740
readEuCodedFile,
3841
input.file = input.file,
3942
dbg = dbg,
40-
if (interactive()) list() else list(...)
43+
dot.args
4144
))
4245

4346
# Return the error object if an error occurred

0 commit comments

Comments
 (0)