From badfa6df233874b1f3b18ef12e5a76c8e28306d4 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 12 Feb 2018 17:37:41 +0000
Subject: [PATCH] Add 'set unpack=1' for consistency with subset extraction
 (This does not unpack twice!)

---
 tests/bufr_filter_extract_area.sh     | 2 ++
 tests/bufr_filter_extract_datetime.sh | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/tests/bufr_filter_extract_area.sh b/tests/bufr_filter_extract_area.sh
index c32e96c01..28f3e245c 100755
--- a/tests/bufr_filter_extract_area.sh
+++ b/tests/bufr_filter_extract_area.sh
@@ -32,6 +32,7 @@ fRules=${label}.filter
 #-----------------------------------------------------------
 cat > $fRules <<EOF
  transient originalNumberOfSubsets = numberOfSubsets;
+ set unpack=1;
  set extractAreaNorthLatitude=52.5;
  set extractAreaSouthLatitude=51.1;
  set extractAreaWestLongitude=155.2;
@@ -142,6 +143,7 @@ inputBufr="delayed_repl_01.bufr"
 outputBufr=${label}.${inputBufr}.out
 cat > $fRules <<EOF
  transient originalNumberOfSubsets = numberOfSubsets;
+ set unpack=1;
  set extractAreaNorthLatitude = -21.0;
  set extractAreaSouthLatitude = -25.0;
  set extractAreaWestLongitude = 136;
diff --git a/tests/bufr_filter_extract_datetime.sh b/tests/bufr_filter_extract_datetime.sh
index 454ed59ff..66bf348da 100755
--- a/tests/bufr_filter_extract_datetime.sh
+++ b/tests/bufr_filter_extract_datetime.sh
@@ -32,6 +32,7 @@ fRules=${label}.filter
 #-----------------------------------------------------------
 cat > $fRules <<EOF
  transient originalNumberOfSubsets = numberOfSubsets;
+ set unpack=1;
 
  transient extractDateTimeYearStart=2012;
  transient extractDateTimeMonthStart=10;
@@ -127,6 +128,7 @@ diff $outputRef $outputFilt
 #-----------------------------------------------------------
 cat > $fRules <<EOF
  transient originalNumberOfSubsets=numberOfSubsets;
+ set unpack=1;
  transient extractDateTimeYearStart=2012;
  transient extractDateTimeMonthStart=19; # Bad month
  transient extractDateTimeDayStart=31;
@@ -161,6 +163,7 @@ fi
 #-----------------------------------------------------------
 cat > $fRules <<EOF
  transient originalNumberOfSubsets=numberOfSubsets;
+ set unpack=1;
  transient extractDateTimeYearStart=2012;
  transient extractDateTimeMonthStart=10;
  transient extractDateTimeDayStart=31;
@@ -195,6 +198,7 @@ fi
 #-----------------------------------------------------------
 cat > $fRules <<EOF
  transient originalNumberOfSubsets=numberOfSubsets;
+ set unpack=1;
  transient extractDateTimeYearStart  =2012;
  transient extractDateTimeMonthStart =10;
  transient extractDateTimeDayStart   =31;