Skip to content

Commit 6ee3ef5

Browse files
committed
fix for units before "to"
1 parent 3f39ccc commit 6ee3ef5

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

R/parseOSD_functions.R

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,15 @@
385385
h <- gsub(" *[1l]/2", ".5", h)
386386
h <- gsub(" *[1l]/[48]", ".25", h) # NB: fudging 1/8 inch -> 1 cm
387387
h <- gsub("^\\.", "0.", h)
388-
h_num <- grep("^\\d+\\.*\\d*$", h)
388+
i_num <- grep("^\\d+\\.*\\d*$", h)
389389
# fill missing depth with NA
390-
if (length(h_num) == 1) {
391-
h_num <- c(h_num, NA)
390+
if (length(i_num) == 1) {
391+
i_num <- c(i_num, NA)
392392
}
393-
h_alp <- grep("[A-Za-z]", h)[2:3]
394-
h <- h[c(h_alp[1], h_num, h_alp[2])]
393+
h_num <- h[i_num]
394+
l_alp <- grepl("[A-Za-z]", h)
395+
h_alp <- h[l_alp & h != "to" & h != "-"][2:3]
396+
h <- c(h_alp[1], h_num, h_alp[2])
395397

396398
} else {
397399
h[2] <- gsub("0", "O", h[2], fixed=TRUE)

0 commit comments

Comments
 (0)