Merge branch 'master' into add-iphc-2024-data

pbs-assess · Jan 23, 2025 · b32830c · b32830c
2 parents 1a0813c + 80903d0
commit b32830c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: gfdata
 Title: Data Extraction for DFO PBS Groundfish Stocks
-Version: 0.1.3
+Version: 0.1.4
 Authors@R: c(
     person(c("Elise", "A."), "Keppel", role = "aut"),
     person(c("Philina", "A."), "English", 

diff --git a/NEWS.md b/NEWS.md
@@ -20,6 +20,13 @@
 
 
 
+## 0.1.4 2024-12-20
+
+- Comment out SQL that was dropping midwater trawl discard weights before 2006.
+  See line in `inst/sql/get-catch.sql` about trip category `OPT B`.
+  Currently line 22. We see no reason to remove these.
+
+
 ## 0.1.3 2024-07-17
 
 - For commercial biological samples: discards with a null sample source code are

diff --git a/gfdata.Rproj b/gfdata.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 97596da8-8349-4c9e-8f87-8b8f25e30e10
 
 RestoreWorkspace: No
 SaveWorkspace: No

diff --git a/inst/sql/get-catch.sql b/inst/sql/get-catch.sql
@@ -19,7 +19,7 @@ SELECT
   LANDED_KG,
   CASE WHEN GEAR IN ('TRAP', 'HOOK AND LINE', 'MIDWATER TRAWL') AND YEAR(BEST_DATE) < 2006 THEN 0
 	WHEN GEAR IN ('BOTTOM TRAWL', 'UNKNOWN TRAWL') AND YEAR(BEST_DATE) <1996 THEN 0
-	WHEN TRIP_CATEGORY IN ('OPT B') AND YEAR(BEST_DATE) <2006 THEN 0
+	-- WHEN TRIP_CATEGORY IN ('OPT B') AND YEAR(BEST_DATE) <2006 THEN 0
 	ELSE DISCARDED_KG END AS DISCARDED_KG,
   LANDED_PCS,
   DISCARDED_PCS,