Merge pull request #359 from StoXProject/datsusc

Added expandFilterExpressionList() in FilterLanding().
StoXProject · May 2, 2024 · 70895e6 · 70895e6
2 parents 243eadc + 091f383
commit 70895e6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/check-full.yaml b/.github/workflows/check-full.yaml
@@ -27,7 +27,7 @@ jobs:
           - {os: macOS-latest,   r: 'release', pkgext: '.tgz'}
           - {os: macOS-latest,   r: '4.3',     pkgext: '.tgz'}
           - {os: macOS-latest,   r: '4.2',     pkgext: '.tgz'}
-          - {os: macOS-latest,   r: '4.1',     pkgext: '.tgz'}
+          # - {os: macOS-latest,   r: '4.1',     pkgext: '.tgz'} # Disabled due to units failure
           # - {os: macOS-latest,   r: '4.0',     pkgext: '.tgz'} # Failing in Install system dependencies on macOS
           # Disccarded due to the following missing packages on Mac for R 3.6: tinytest, Rcpp, xml2, units, stringi, data.table:
           #- {os: macOS-latest,   r: '3.6',     pkgext: '.tgz'}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RstoxData
-Version: 1.10.2-9006
-Date: 2024-04-19
+Version: 1.10.2-9007
+Date: 2024-05-02
 Title: Tools to Read and Manipulate Fisheries Data
 Authors@R: c(
   person(given = "Edvin", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# RstoxData v1.10.2-9002  (2024-04-25)
+* Fixed more bugs in writeLevel() and exported sanitizeExpression.
+
 # RstoxData v1.10.2-9002  (2023-11-06)
 * Added parameter format class "folderPath".
 * Added branch "testing" which will deploy to the testingRepo.

diff --git a/R/Filter.R b/R/Filter.R
@@ -494,7 +494,8 @@ FilterBiotic <- function(BioticData, FilterExpression = list(), FilterUpwards =
 #' @export
 #' 
 FilterAcoustic <- function(AcousticData, FilterExpression = list(), FilterUpwards = FALSE) {
-    # For filtering directly on the input data, we need to split the list filter expression to one level for the file and one for the table:
+
+	# For filtering directly on the input data, we need to split the list filter expression to one level for the file and one for the table:
     FilterExpression <- expandFilterExpressionList(FilterExpression)
 
     filterData(
@@ -520,6 +521,9 @@ FilterAcoustic <- function(AcousticData, FilterExpression = list(), FilterUpward
 #' @export
 #' 
 FilterLanding <- function(LandingData, FilterExpression = list(), FilterUpwards = FALSE) {
+	# For filtering directly on the input data, we need to split the list filter expression to one level for the file and one for the table:
+	FilterExpression <- expandFilterExpressionList(FilterExpression)
+
 	filterData(
 		LandingData, 
 		filterExpression = FilterExpression,