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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - # \S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\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* 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 --> - # \S*, *\S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - # \S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\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* 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 --> - # \S*, *\S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\s* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* @@ -80,8 +80,8 @@ STRING STRING STRING - LOCAL_DATE - LOCAL_TIME + STRING + LOCAL_DATE_TIME - dd MMM yyyy - HH:mm:ss + dd MMM yyyy HH:mm:ss - 5 6 - Pacific/Honolulu + Pacific/Pohnpei 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. --> - /home/kilonalu/PIFM02_001CTDXXXXR00_latest_data.txt + /home/kilonalu/PIFM02_101CTDXXXXR00_latest_data.txt PIFM02_101CTDXXXXR00 @@ -50,7 +50,7 @@ The regular expression used to match a data sample. Best to keep the data pattern on one line below --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - #\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* + #\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* 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 --> - # \S*, *\S*, *\S*, *\S*, *\S*, *\d{2} \S{3} \d{4} \d{2}:\d{2}:\d{2}\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*