Fixed FHX2 FORMAT string bug in read_fhx()

ltrr-arizona-edu · Feb 7, 2017 · 933f6e3 · 933f6e3
1 parent 4bee3f0
commit 933f6e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,8 @@
 
 Changes in this minor release:
 
+* Fixed additional bug in `read_fhx()` caused by "FHX2 format" in FHX file header.
+
 * Fixed bug #71, causing `read_fhx()` to fail when FHX has empty lastline.
 
 * Added `text` option to `read_fhx()`.

diff --git a/R/io.R b/R/io.R
@@ -28,9 +28,9 @@ read_fhx <- function(fname, encoding, text) {
   if (length(readLines(con, n = 1)) == 0)
     stop("file appears to be empty")
   fl <- readLines(con, warn = FALSE)
-  if (!any(suppressWarnings(grepl("FHX2 FORMAT|FIRE2 FORMAT", fl, ignore.case = TRUE))))
+  if (!any(suppressWarnings(grepl("^FHX2 FORMAT|^FIRE2 FORMAT", fl, ignore.case = TRUE))))
     stop("Cannot find line 'FHX2 FORMAT' or 'FIRE2 FORMAT'.")
-  first <- suppressWarnings(grep("FHX2 FORMAT|FIRE2 FORMAT", fl, ignore.case = TRUE))
+  first <- suppressWarnings(grep("^FHX2 FORMAT|^FIRE2 FORMAT", fl, ignore.case = TRUE))
   describe <- as.numeric(strsplit(fl[[first + 1]], " ")[[1]])
   if (length(describe) != 3) {  # First year; no. sites; length of site id.
     stop(paste("Three-digit descriptive information that should be on line ",