From 03143ad67a2e48560410c5eedf07cdbb185c8788 Mon Sep 17 00:00:00 2001
From: Christopher Jones <csj@christopherjones.co>
Date: Mon, 17 Jan 2022 16:06:37 -0700
Subject: [PATCH] Update configuration files with more accurate dataPattern
 fields.

---
 conf/offline/PIAS01_001CTDXXXXR00.xml |  2 +-
 conf/offline/PIFM02_002CTDXXXXR00.xml |  2 +-
 conf/offline/PIGM01_003CTDX002R00.xml |  2 +-
 conf/offline/PIMI01_001CTDXXXXR00.xml |  2 +-
 conf/offline/PIPL01_001CTDXXXXR00.xml |  2 +-
 conf/online/AW02XX_001CTDXXXXR00.xml  |  2 +-
 conf/online/MB01XX_001CTDXXXXR00.xml  |  2 +-
 conf/retired/AW01XX_001CTDXXXXR00.xml |  2 +-
 conf/retired/AW02XX_101CTDXXXXR00.xml |  2 +-
 conf/retired/AW02XX_201CTDXXXXR00.xml |  2 +-
 conf/retired/MB01XX_101CTDXXXXR00.xml |  2 +-
 conf/retired/MB02XX_001CTDXXXXR00.xml |  2 +-
 conf/retired/PIFM01_001CTDXXXXR00.xml |  2 +-
 conf/retired/PIFM01_101CTDXXXXR00.xml |  2 +-
 conf/retired/PIFM02_001CTDXXXXR00.xml | 12 +++++-------
 conf/retired/PIFM02_101CTDXXXXR00.xml |  4 ++--
 conf/retired/PIGM01_001CTDXXXXR00.xml |  2 +-
 conf/retired/PIGM01_002CTDX002R00.xml |  2 +-
 conf/retired/pp2_pohnpei.xml          |  2 +-
 19 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/conf/offline/PIAS01_001CTDXXXXR00.xml b/conf/offline/PIAS01_001CTDXXXXR00.xml
index 31b0cd2..459e405 100644
--- a/conf/offline/PIAS01_001CTDXXXXR00.xml
+++ b/conf/offline/PIAS01_001CTDXXXXR00.xml
@@ -49,7 +49,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/offline/PIFM02_002CTDXXXXR00.xml b/conf/offline/PIFM02_002CTDXXXXR00.xml
index 96025b4..86814b9 100644
--- a/conf/offline/PIFM02_002CTDXXXXR00.xml
+++ b/conf/offline/PIFM02_002CTDXXXXR00.xml
@@ -49,7 +49,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/offline/PIGM01_003CTDX002R00.xml b/conf/offline/PIGM01_003CTDX002R00.xml
index ee744fe..eadc07b 100644
--- a/conf/offline/PIGM01_003CTDX002R00.xml
+++ b/conf/offline/PIGM01_003CTDX002R00.xml
@@ -52,7 +52,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/offline/PIMI01_001CTDXXXXR00.xml b/conf/offline/PIMI01_001CTDXXXXR00.xml
index 7182fa5..59ceb56 100644
--- a/conf/offline/PIMI01_001CTDXXXXR00.xml
+++ b/conf/offline/PIMI01_001CTDXXXXR00.xml
@@ -49,7 +49,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/offline/PIPL01_001CTDXXXXR00.xml b/conf/offline/PIPL01_001CTDXXXXR00.xml
index 6f761a5..44022e7 100644
--- a/conf/offline/PIPL01_001CTDXXXXR00.xml
+++ b/conf/offline/PIPL01_001CTDXXXXR00.xml
@@ -51,7 +51,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/online/AW02XX_001CTDXXXXR00.xml b/conf/online/AW02XX_001CTDXXXXR00.xml
index 3c534ff..b39b09e 100644
--- a/conf/online/AW02XX_001CTDXXXXR00.xml
+++ b/conf/online/AW02XX_001CTDXXXXR00.xml
@@ -64,7 +64,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern># \S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/online/MB01XX_001CTDXXXXR00.xml b/conf/online/MB01XX_001CTDXXXXR00.xml
index 33bdd8c..ab22da8 100644
--- a/conf/online/MB01XX_001CTDXXXXR00.xml
+++ b/conf/online/MB01XX_001CTDXXXXR00.xml
@@ -64,7 +64,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern># \S*, *\S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/AW01XX_001CTDXXXXR00.xml b/conf/retired/AW01XX_001CTDXXXXR00.xml
index ee62784..2cc178b 100644
--- a/conf/retired/AW01XX_001CTDXXXXR00.xml
+++ b/conf/retired/AW01XX_001CTDXXXXR00.xml
@@ -64,7 +64,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}+d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}+d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/AW02XX_101CTDXXXXR00.xml b/conf/retired/AW02XX_101CTDXXXXR00.xml
index d72899b..6bcf8db 100644
--- a/conf/retired/AW02XX_101CTDXXXXR00.xml
+++ b/conf/retired/AW02XX_101CTDXXXXR00.xml
@@ -51,7 +51,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s*\S+,\s*\S*,\s*\S+,\s*\S+,\s*\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/AW02XX_201CTDXXXXR00.xml b/conf/retired/AW02XX_201CTDXXXXR00.xml
index 5ee112d..d2fc198 100644
--- a/conf/retired/AW02XX_201CTDXXXXR00.xml
+++ b/conf/retired/AW02XX_201CTDXXXXR00.xml
@@ -51,7 +51,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s*\S+,\s*\S*,\s*\S+,\s*\S+,\s*\S+,\s*\S+,\s*\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/MB01XX_101CTDXXXXR00.xml b/conf/retired/MB01XX_101CTDXXXXR00.xml
index 694fd30..982de41 100644
--- a/conf/retired/MB01XX_101CTDXXXXR00.xml
+++ b/conf/retired/MB01XX_101CTDXXXXR00.xml
@@ -51,7 +51,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern># \S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/MB02XX_001CTDXXXXR00.xml b/conf/retired/MB02XX_001CTDXXXXR00.xml
index 0568062..bd6207f 100644
--- a/conf/retired/MB02XX_001CTDXXXXR00.xml
+++ b/conf/retired/MB02XX_001CTDXXXXR00.xml
@@ -64,7 +64,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern># \S*, *\S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/PIFM01_001CTDXXXXR00.xml b/conf/retired/PIFM01_001CTDXXXXR00.xml
index 71f9844..af03e9e 100644
--- a/conf/retired/PIFM01_001CTDXXXXR00.xml
+++ b/conf/retired/PIFM01_001CTDXXXXR00.xml
@@ -54,7 +54,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/PIFM01_101CTDXXXXR00.xml b/conf/retired/PIFM01_101CTDXXXXR00.xml
index 6a8c25e..064b65d 100644
--- a/conf/retired/PIFM01_101CTDXXXXR00.xml
+++ b/conf/retired/PIFM01_101CTDXXXXR00.xml
@@ -55,7 +55,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/PIFM02_001CTDXXXXR00.xml b/conf/retired/PIFM02_001CTDXXXXR00.xml
index f4dfac1..ac8f2c9 100644
--- a/conf/retired/PIFM02_001CTDXXXXR00.xml
+++ b/conf/retired/PIFM02_001CTDXXXXR00.xml
@@ -63,7 +63,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4},\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
@@ -80,8 +80,8 @@
                 <columnType>STRING</columnType>
                 <columnType>STRING</columnType>
                 <columnType>STRING</columnType>
-                <columnType>LOCAL_DATE</columnType>
-                <columnType>LOCAL_TIME</columnType>
+                <columnType>STRING</columnType>
+                <columnType>LOCAL_DATE_TIME</columnType>
             </columnTypes>
             <!--
               The character that delimits variables within the sample
@@ -99,15 +99,13 @@
               Note: dateFormat and dateField are used together to locate, then parse the sample date
               -->
             <dateFormats>
-                <dateFormat>dd MMM yyyy</dateFormat> 
-                <dateFormat>HH:mm:ss</dateFormat> 
+                <dateFormat>dd MMM yyyy HH:mm:ss</dateFormat> 
             </dateFormats>
             <!-- 
               The list of date fields for each sample date component in a separate variable
               One or more date fields are required, corresponding to the date/time variable positions in the data 
             -->        
             <dateFields>
-                <dateField>5</dateField>
                 <dateField>6</dateField>
             </dateFields>
             <!--
@@ -119,7 +117,7 @@
               GMT+13:00 will also work, it may change over time due to daylight savings,
               so the long identifier is best.
             -->
-            <timeZone>Pacific/Honolulu</timeZone>
+            <timeZone>Pacific/Pohnpei</timeZone>
             <!-- The list of data archivers used to write data to disk -->
             <archivers>
                 <!-- Write the raw data to /data/raw -->
diff --git a/conf/retired/PIFM02_101CTDXXXXR00.xml b/conf/retired/PIFM02_101CTDXXXXR00.xml
index 341c58a..0b8a299 100644
--- a/conf/retired/PIFM02_101CTDXXXXR00.xml
+++ b/conf/retired/PIFM02_101CTDXXXXR00.xml
@@ -14,7 +14,7 @@
       below. If serial, add serialPortParams and sub elements below.
     -->
     <connectionParams>
-        <filePath>/home/kilonalu/PIFM02_001CTDXXXXR00_latest_data.txt</filePath>
+        <filePath>/home/kilonalu/PIFM02_101CTDXXXXR00_latest_data.txt</filePath>
     </connectionParams>
     <!-- The name of the instrument source as it appears in the DataTurbine -->
     <rbnbName>PIFM02_101CTDXXXXR00</rbnbName>
@@ -50,7 +50,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/PIGM01_001CTDXXXXR00.xml b/conf/retired/PIGM01_001CTDXXXXR00.xml
index e272963..d508f2b 100644
--- a/conf/retired/PIGM01_001CTDXXXXR00.xml
+++ b/conf/retired/PIGM01_001CTDXXXXR00.xml
@@ -37,7 +37,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/PIGM01_002CTDX002R00.xml b/conf/retired/PIGM01_002CTDX002R00.xml
index c735b49..418958a 100644
--- a/conf/retired/PIGM01_002CTDX002R00.xml
+++ b/conf/retired/PIGM01_002CTDX002R00.xml
@@ -52,7 +52,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below 
             -->
-            <dataPattern>#\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\S*,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->
diff --git a/conf/retired/pp2_pohnpei.xml b/conf/retired/pp2_pohnpei.xml
index a0a6b7f..c114564 100644
--- a/conf/retired/pp2_pohnpei.xml
+++ b/conf/retired/pp2_pohnpei.xml
@@ -64,7 +64,7 @@
               The regular expression used to match a data sample.
               Best to keep the data pattern on one line below
             -->
-            <dataPattern># \S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s*</dataPattern>
+            <dataPattern>#\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\S+,\s+\d{2}\s+\S{3}\s+\d{4}\s+\d{2}:\d{2}:\d{2}\s*</dataPattern>
             <!--
                 dataPrefix: A string of characters that prefix the data in a sample (e.g. '#')
             -->