From 05b7407e59d293e41f5b03ebc76007d8dd535de8 Mon Sep 17 00:00:00 2001 From: chad-iris Date: Sun, 22 Aug 2021 07:38:41 -0700 Subject: [PATCH] Update Source Identifier handling to the adopted specification --- ChangeLog | 4 +++ example/lm_sids.c | 2 +- genutils.c | 36 +++++++++++-------- libmseed.h | 6 ++-- test/parse-sids.test | 2 +- test/parse-sids.test.ref | 12 +++---- test/read-CDSN-encoded.test.ref | 2 +- test/read-DWWSSN-encoded.test.ref | 2 +- test/read-Float32-encoded.test.ref | 2 +- test/read-Float64-encoded.test.ref | 2 +- test/read-GEOSCOPE163-encoded.test.ref | 2 +- test/read-Int16-encoded.test.ref | 2 +- test/read-Int32-1024byte-encoded.test.ref | 2 +- test/read-Int32-128byte-encoded.test.ref | 2 +- test/read-Int32-2048byte-encoded.test.ref | 2 +- test/read-Int32-256byte-encoded.test.ref | 2 +- test/read-Int32-4096byte-encoded.test.ref | 2 +- test/read-Int32-512byte-encoded.test.ref | 2 +- test/read-Int32-8192byte-encoded.test.ref | 2 +- test/read-SRO-encoded.test.ref | 2 +- test/read-Steim1-bigendian.test.ref | 2 +- test/read-Steim1-littleendian.test.ref | 2 +- test/read-Steim2-bigendian.test.ref | 2 +- test/read-Steim2-littleendian.test.ref | 2 +- test/read-buffer-tracelist.test.ref | 2 +- test/read-byterange.test.ref | 4 +-- test/read-detection-record.test.ref | 2 +- test/read-invalid-blockette-offsets.test.ref | 14 ++++---- ...ad-mixed-order-mixed-length-trace.test.ref | 2 +- test/read-no-blockette1000.test.ref | 4 +-- test/read-recordlist.test.ref | 2 +- test/read-selection.test.ref | 6 ++-- test/read-text-encoded.test.ref | 2 +- test/read-unapplied-timecorrection.test.ref | 2 +- 34 files changed, 75 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce6f261..cf63cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021.234: 3.0.9 + - Update Source Identifier handling to the adopted specification of: + FDSN:NET_STA_LOC_BAND_SOURCE_POSITION + 2020.156: 3.0.8 - Add error/warning log registry for accumulation of messages. - Log and diagnostic printing callbacks now require 'const char *'. diff --git a/example/lm_sids.c b/example/lm_sids.c index 0fb1a5f..954fc2f 100644 --- a/example/lm_sids.c +++ b/example/lm_sids.c @@ -62,7 +62,7 @@ main (int argc, char **argv) char *sid; int idx; - sid = "XFDSN:NET_STA_LOC_C_H_N"; + sid = "FDSN:NET_STA_LOC_C_H_N"; if (map_sid (sid)) { diff --git a/genutils.c b/genutils.c index 487b694..a2578d2 100644 --- a/genutils.c +++ b/genutils.c @@ -3,7 +3,7 @@ * * This file is part of the miniSEED Library. * - * Copyright (c) 2020 Chad Trabant, IRIS Data Management Center + * Copyright (c) 2021 Chad Trabant, IRIS Data Management Center * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,10 +113,13 @@ static const int monthdays_leap[] = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, /**********************************************************************/ /** - * @brief Parse network, station, location and channel from a source ID URI + * @brief Parse network, station, location and channel from an FDSN Source ID + * + * FDSN Source Identifiers are defined at: + * https://docs.fdsn.org/projects/source-identifiers/ * * Parse a source identifier into separate components, expecting: - * \c "XFDSN:NET_STA_LOC_CHAN", where \c CHAN="BAND_SOURCE_POSITION" + * \c "FDSN:NET_STA_LOC_CHAN", where \c CHAN="BAND_SOURCE_POSITION" * * The CHAN value will be converted to a SEED channel code if * possible. Meaning, if the BAND, SOURCE, and POSITION are single @@ -124,7 +127,11 @@ static const int monthdays_leap[] = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, * returned channel. * * Identifiers may contain additional namespace identifiers, e.g.: - * \c "XFDSN:AGENCY:NET_STA_LOC_CHAN" + * \c "FDSN:AGENCY:NET_STA_LOC_CHAN" + * + * Such additional namespaces are not part of the Source ID standard + * as of this writing and support is included for specialized usage or + * future identifier changes. * * Memory for each component must already be allocated. If a specific * component is not desired set the appropriate argument to NULL. @@ -154,21 +161,20 @@ ms_sid2nslc (char *sid, char *net, char *sta, char *loc, char *chan) return -1; } - /* Handle the XFDSN: and FDSN: namespace identifiers */ - if (!strncmp (sid, "XFDSN:", 6) || - !strncmp (sid, "FDSN:", 5)) + /* Handle the FDSN: namespace identifier */ + if (!strncmp (sid, "FDSN:", 5)) { /* Advance sid pointer to last ':', skipping all namespace identifiers */ sid = strrchr (sid, ':') + 1; - /* Verify 3 or 5 delimiters */ + /* Verify 5 delimiters */ id = sid; while ((id = strchr (id, '_'))) { id++; sepcnt++; } - if (sepcnt != 3 && sepcnt != 5) + if (sepcnt != 5) { ms_log (2, "Incorrect number of identifier delimiters (%d): %s\n", sepcnt, sid); return -1; @@ -205,7 +211,7 @@ ms_sid2nslc (char *sid, char *net, char *sta, char *loc, char *chan) top = next; } - /* Location (potentially empty) */ + /* Location, potentially empty */ if ((ptr = strchr (top, '_'))) { next = ptr + 1; @@ -240,11 +246,14 @@ ms_sid2nslc (char *sid, char *net, char *sta, char *loc, char *chan) } /* End of ms_sid2nslc() */ /**********************************************************************/ /** - * @brief Convert network, station, location and channel to a source ID URI + * @brief Convert network, station, location and channel to an FDSN Source ID + * + * FDSN Source Identifiers are defined at: + * https://docs.fdsn.org/projects/source-identifiers/ * * Create a source identifier from individual network, * station, location and channel codes with the form: - * \c XFDSN:NET_STA_LOC_CHAN, where \c CHAN="BAND_SOURCE_POSITION" + * \c FDSN:NET_STA_LOC_CHAN, where \c CHAN="BAND_SOURCE_POSITION" * * Memory for the source identifier must already be allocated. If a * specific component is NULL it will be empty in the resulting @@ -288,13 +297,12 @@ ms_nslc2sid (char *sid, int sidlen, uint16_t flags, return -1; } - *sptr++ = 'X'; *sptr++ = 'F'; *sptr++ = 'D'; *sptr++ = 'S'; *sptr++ = 'N'; *sptr++ = ':'; - needed = 6; + needed = 5; if (net) { diff --git a/libmseed.h b/libmseed.h index b655427..b905670 100644 --- a/libmseed.h +++ b/libmseed.h @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright (C) 2020: + * Copyright (C) 2021: * @author Chad Trabant, IRIS Data Management Center ***************************************************************************/ @@ -28,8 +28,8 @@ extern "C" { #endif -#define LIBMSEED_VERSION "3.0.8" //!< Library version -#define LIBMSEED_RELEASE "2020.156" //!< Library release date +#define LIBMSEED_VERSION "3.0.1" //!< Library version +#define LIBMSEED_RELEASE "2021.234" //!< Library release date /** @defgroup io-functions File and URL I/O */ /** @defgroup miniseed-record Record Handling */ diff --git a/test/parse-sids.test b/test/parse-sids.test index cb92bbf..df1a66f 100755 --- a/test/parse-sids.test +++ b/test/parse-sids.test @@ -1,4 +1,4 @@ #!/bin/sh LD_LIBRARY_PATH=.. \ DYLD_LIBRARY_PATH=.. \ -./lm_sids XFDSN:XX_TEST__L_H_Z XFDSN:NETWORK_STATION_LOCATION_BAND_SOURCE_POSITION +./lm_sids FDSN:XX_TEST__L_H_Z FDSN:NETWORK_STATION_LOCATION_BAND_SOURCE_POSITION diff --git a/test/parse-sids.test.ref b/test/parse-sids.test.ref index 881049a..bb1c539 100644 --- a/test/parse-sids.test.ref +++ b/test/parse-sids.test.ref @@ -1,9 +1,9 @@ -Original SID: 'XFDSN:NET_STA_LOC_C_H_N' +Original SID: 'FDSN:NET_STA_LOC_C_H_N' network: 'NET', station: 'STA', location: 'LOC', channel: 'CHN' - SID: 'XFDSN:NET_STA_LOC_C_H_N' -Original SID: 'XFDSN:XX_TEST__L_H_Z' + SID: 'FDSN:NET_STA_LOC_C_H_N' +Original SID: 'FDSN:XX_TEST__L_H_Z' network: 'XX', station: 'TEST', location: '', channel: 'LHZ' - SID: 'XFDSN:XX_TEST__L_H_Z' -Original SID: 'XFDSN:NETWORK_STATION_LOCATION_BAND_SOURCE_POSITION' + SID: 'FDSN:XX_TEST__L_H_Z' +Original SID: 'FDSN:NETWORK_STATION_LOCATION_BAND_SOURCE_POSITION' network: 'NETWORK', station: 'STATION', location: 'LOCATION', channel: 'BAND_SOURCE_POSITION' - SID: 'XFDSN:NETWORK_STATION_LOCATION_BAND_SOURCE_POSITION' + SID: 'FDSN:NETWORK_STATION_LOCATION_BAND_SOURCE_POSITION' diff --git a/test/read-CDSN-encoded.test.ref b/test/read-CDSN-encoded.test.ref index 3de3685..5b5b671 100644 --- a/test/read-CDSN-encoded.test.ref +++ b/test/read-CDSN-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__B_H_E, 3, 4096, 2016 samples, 20 Hz, 1986,360,01:11:45.430000 +FDSN:XX_TEST__B_H_E, 3, 4096, 2016 samples, 20 Hz, 1986,360,01:11:45.430000 -96 -87 -100 -128 -123 -83 -52 -54 -77 -108 -130 -120 -92 -93 -106 -108 -96 -57 diff --git a/test/read-DWWSSN-encoded.test.ref b/test/read-DWWSSN-encoded.test.ref index c90f83d..12f8cb0 100644 --- a/test/read-DWWSSN-encoded.test.ref +++ b/test/read-DWWSSN-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__L_H_E, 4, 4096, 2016 samples, 1 Hz, 1980,360,00:00:00.320000 +FDSN:XX_TEST__L_H_E, 4, 4096, 2016 samples, 1 Hz, 1980,360,00:00:00.320000 6 5 1 -9 -18 -19 -7 10 27 34 34 35 40 45 49 44 35 31 diff --git a/test/read-Float32-encoded.test.ref b/test/read-Float32-encoded.test.ref index 4bf8537..fb67a42 100644 --- a/test/read-Float32-encoded.test.ref +++ b/test/read-Float32-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__V_H_E, 2, 4096, 1008 samples, 0.1 Hz, 1986,360,02:12:05.864800 +FDSN:XX_TEST__V_H_E, 2, 4096, 1008 samples, 0.1 Hz, 1986,360,02:12:05.864800 -1.0625 -1.078125 -1.078125 -1.078125 -1.078125 -1.078125 -1.0859375 -1.0859375 -1.0859375 -1.0859375 -1.09375 -1.09375 -1.09375 -1.09375 -1.0859375 -1.0859375 -1.0703125 -1.0625 diff --git a/test/read-Float64-encoded.test.ref b/test/read-Float64-encoded.test.ref index f012695..d069d08 100644 --- a/test/read-Float64-encoded.test.ref +++ b/test/read-Float64-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__V_H_E, 2, 4096, 504 samples, 0.1 Hz, 1986,360,02:12:05.864800 +FDSN:XX_TEST__V_H_E, 2, 4096, 504 samples, 0.1 Hz, 1986,360,02:12:05.864800 -1.0625 -1.078125 -1.078125 -1.078125 -1.078125 -1.078125 -1.0859375 -1.0859375 -1.0859375 -1.0859375 -1.09375 -1.09375 -1.09375 -1.09375 -1.0859375 -1.0859375 -1.0703125 -1.0625 diff --git a/test/read-GEOSCOPE163-encoded.test.ref b/test/read-GEOSCOPE163-encoded.test.ref index 095961e..60e59d0 100644 --- a/test/read-GEOSCOPE163-encoded.test.ref +++ b/test/read-GEOSCOPE163-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__V_H_E, 2, 4096, 2016 samples, 0.1 Hz, 1986,360,02:12:05.864800 +FDSN:XX_TEST__V_H_E, 2, 4096, 2016 samples, 0.1 Hz, 1986,360,02:12:05.864800 -1.0625 -1.078125 -1.078125 -1.078125 -1.078125 -1.078125 -1.0859375 -1.0859375 -1.0859375 -1.0859375 -1.09375 -1.09375 -1.09375 -1.09375 -1.0859375 -1.0859375 -1.0703125 -1.0625 diff --git a/test/read-Int16-encoded.test.ref b/test/read-Int16-encoded.test.ref index c90f83d..12f8cb0 100644 --- a/test/read-Int16-encoded.test.ref +++ b/test/read-Int16-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__L_H_E, 4, 4096, 2016 samples, 1 Hz, 1980,360,00:00:00.320000 +FDSN:XX_TEST__L_H_E, 4, 4096, 2016 samples, 1 Hz, 1980,360,00:00:00.320000 6 5 1 -9 -18 -19 -7 10 27 34 34 35 40 45 49 44 35 31 diff --git a/test/read-Int32-1024byte-encoded.test.ref b/test/read-Int32-1024byte-encoded.test.ref index 7469eca..392fa20 100644 --- a/test/read-Int32-1024byte-encoded.test.ref +++ b/test/read-Int32-1024byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 1024, 240 samples, 1 Hz, 2010,058,06:52:56.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 1024, 240 samples, 1 Hz, 2010,058,06:52:56.069539 -230467 -228682 -231926 -238261 -242006 -245765 -239994 -227824 -226956 -228796 -228197 -233827 -241222 -243646 -238977 -232624 -233808 -238003 diff --git a/test/read-Int32-128byte-encoded.test.ref b/test/read-Int32-128byte-encoded.test.ref index d05bef7..e4c5814 100644 --- a/test/read-Int32-128byte-encoded.test.ref +++ b/test/read-Int32-128byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 128, 16 samples, 1 Hz, 2010,058,06:50:00.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 128, 16 samples, 1 Hz, 2010,058,06:50:00.069539 -231946 -228438 -223155 -221231 -225429 -230129 -229728 -228817 -233187 -237367 -237121 -237361 -235678 -227339 -221762 -224099 diff --git a/test/read-Int32-2048byte-encoded.test.ref b/test/read-Int32-2048byte-encoded.test.ref index c3acdd0..e7fe3cf 100644 --- a/test/read-Int32-2048byte-encoded.test.ref +++ b/test/read-Int32-2048byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 2048, 496 samples, 1 Hz, 2010,058,06:56:56.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 2048, 496 samples, 1 Hz, 2010,058,06:56:56.069539 -153142 -112621 -108174 -121595 -163772 -231395 -270350 -288753 -304109 -302338 -300778 -282568 -245124 -226804 -227315 -260468 -293530 -271944 diff --git a/test/read-Int32-256byte-encoded.test.ref b/test/read-Int32-256byte-encoded.test.ref index 28353c9..fda55c3 100644 --- a/test/read-Int32-256byte-encoded.test.ref +++ b/test/read-Int32-256byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 256, 48 samples, 1 Hz, 2010,058,06:50:16.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 256, 48 samples, 1 Hz, 2010,058,06:50:16.069539 -228777 -234345 -238060 -237690 -233484 -226807 -221838 -222905 -228070 -226135 -220353 -223352 -235952 -246300 -247116 -250785 -253608 -251682 diff --git a/test/read-Int32-4096byte-encoded.test.ref b/test/read-Int32-4096byte-encoded.test.ref index 806a086..b4521d6 100644 --- a/test/read-Int32-4096byte-encoded.test.ref +++ b/test/read-Int32-4096byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 4096, 1008 samples, 1 Hz, 2010,058,07:05:12.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 4096, 1008 samples, 1 Hz, 2010,058,07:05:12.069539 -29830 -19121 -11992 -34742 -79039 -143930 -224678 -290521 -352960 -430518 -514423 -578644 -616867 -665113 -697232 -663119 -581334 -496365 diff --git a/test/read-Int32-512byte-encoded.test.ref b/test/read-Int32-512byte-encoded.test.ref index 175e043..74caa5b 100644 --- a/test/read-Int32-512byte-encoded.test.ref +++ b/test/read-Int32-512byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 512, 112 samples, 1 Hz, 2010,058,06:51:04.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 512, 112 samples, 1 Hz, 2010,058,06:51:04.069539 -242196 -236764 -232792 -228731 -227703 -228600 -226246 -229232 -236837 -242076 -250265 -255144 -253173 -249842 -243233 -234785 -227107 -223531 diff --git a/test/read-Int32-8192byte-encoded.test.ref b/test/read-Int32-8192byte-encoded.test.ref index 01dd0c9..ce7985d 100644 --- a/test/read-Int32-8192byte-encoded.test.ref +++ b/test/read-Int32-8192byte-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_L_H_Z, 1, 8192, 2032 samples, 1 Hz, 2010,058,07:22:00.069539 +FDSN:XX_TEST_00_L_H_Z, 1, 8192, 2032 samples, 1 Hz, 2010,058,07:22:00.069539 -211177 -198408 -186816 -180482 -188315 -202233 -209662 -217296 -229917 -242629 -249839 -245578 -229951 -210958 -197340 -191353 -190652 -192886 diff --git a/test/read-SRO-encoded.test.ref b/test/read-SRO-encoded.test.ref index 9720a37..50c5689 100644 --- a/test/read-SRO-encoded.test.ref +++ b/test/read-SRO-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__L_H_E, 4, 4096, 1984 samples, 1 Hz, 1974,360,00:00:00.500000 +FDSN:XX_TEST__L_H_E, 4, 4096, 1984 samples, 1 Hz, 1974,360,00:00:00.500000 39 42 32 1 -38 -86 -140 -173 -160 -120 -69 -26 13 45 63 69 56 27 diff --git a/test/read-Steim1-bigendian.test.ref b/test/read-Steim1-bigendian.test.ref index 6367fad..eaedcd8 100644 --- a/test/read-Steim1-bigendian.test.ref +++ b/test/read-Steim1-bigendian.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__B_H_Z, 2, 4096, 623 samples, 20.00022125 Hz, 1990,337,23:59:28.872500 +FDSN:XX_TEST__B_H_Z, 2, 4096, 623 samples, 20.00022125 Hz, 1990,337,23:59:28.872500 2757 3299 3030 2326 2472 3201 3280 2753 2305 2371 3077 3287 2313 1828 2649 3199 2685 2127 diff --git a/test/read-Steim1-littleendian.test.ref b/test/read-Steim1-littleendian.test.ref index 6367fad..eaedcd8 100644 --- a/test/read-Steim1-littleendian.test.ref +++ b/test/read-Steim1-littleendian.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__B_H_Z, 2, 4096, 623 samples, 20.00022125 Hz, 1990,337,23:59:28.872500 +FDSN:XX_TEST__B_H_Z, 2, 4096, 623 samples, 20.00022125 Hz, 1990,337,23:59:28.872500 2757 3299 3030 2326 2472 3201 3280 2753 2305 2371 3077 3287 2313 1828 2649 3199 2685 2127 diff --git a/test/read-Steim2-bigendian.test.ref b/test/read-Steim2-bigendian.test.ref index 5389ff4..446d3d7 100644 --- a/test/read-Steim2-bigendian.test.ref +++ b/test/read-Steim2-bigendian.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__L_H_Z, 1, 4096, 3096 samples, 1 Hz, 2016,062,12:36:06.069538 +FDSN:XX_TEST__L_H_Z, 1, 4096, 3096 samples, 1 Hz, 2016,062,12:36:06.069538 -10780 -10779 -10782 -10783 -10781 -10781 -10781 -10779 -10778 -10777 -10776 -10774 -10776 -10775 -10772 -10774 -10772 -10771 diff --git a/test/read-Steim2-littleendian.test.ref b/test/read-Steim2-littleendian.test.ref index 5389ff4..446d3d7 100644 --- a/test/read-Steim2-littleendian.test.ref +++ b/test/read-Steim2-littleendian.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__L_H_Z, 1, 4096, 3096 samples, 1 Hz, 2016,062,12:36:06.069538 +FDSN:XX_TEST__L_H_Z, 1, 4096, 3096 samples, 1 Hz, 2016,062,12:36:06.069538 -10780 -10779 -10782 -10783 -10781 -10781 -10781 -10779 -10778 -10777 -10776 -10774 -10776 -10775 -10772 -10774 -10772 -10771 diff --git a/test/read-buffer-tracelist.test.ref b/test/read-buffer-tracelist.test.ref index ee93145..d14d872 100644 --- a/test/read-buffer-tracelist.test.ref +++ b/test/read-buffer-tracelist.test.ref @@ -1,4 +1,4 @@ Total records: 7 SourceID Start sample End sample Gap Hz Samples -XFDSN:XX_TEST_00_L_H_Z 2010-02-27T06:50:00.069539 2010-02-27T07:55:51.069539 == 1 3952 +FDSN:XX_TEST_00_L_H_Z 2010-02-27T06:50:00.069539 2010-02-27T07:55:51.069539 == 1 3952 Total: 1 trace(s) with 1 segment(s) diff --git a/test/read-byterange.test.ref b/test/read-byterange.test.ref index 56d9f49..095d24b 100644 --- a/test/read-byterange.test.ref +++ b/test/read-byterange.test.ref @@ -1,2 +1,2 @@ -XFDSN:IU_COLA_00_L_H_1, 4, 512, 126 samples, 1 Hz, 2010,058,06:55:23.069541 -XFDSN:IU_COLA_00_L_H_1, 4, 512, 156 samples, 1 Hz, 2010,058,06:57:29.069539 +FDSN:IU_COLA_00_L_H_1, 4, 512, 126 samples, 1 Hz, 2010,058,06:55:23.069541 +FDSN:IU_COLA_00_L_H_1, 4, 512, 156 samples, 1 Hz, 2010,058,06:57:29.069539 diff --git a/test/read-detection-record.test.ref b/test/read-detection-record.test.ref index 9c03087..11b3ad1 100644 --- a/test/read-detection-record.test.ref +++ b/test/read-detection-record.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_B_H_Z, version 2, 512 bytes (format: 2) +FDSN:XX_TEST_00_B_H_Z, version 2, 512 bytes (format: 2) start time: 2004,210,20:28:09.000000 number of samples: 0 sample rate (Hz): 0 diff --git a/test/read-invalid-blockette-offsets.test.ref b/test/read-invalid-blockette-offsets.test.ref index a1fec49..7ee8c80 100644 --- a/test/read-invalid-blockette-offsets.test.ref +++ b/test/read-invalid-blockette-offsets.test.ref @@ -1,7 +1,7 @@ -Error: XFDSN:IU_COLA_00_L_H_Z: Unknown blockette length for type 0 -XFDSN:IU_COLA_00_L_H_Z: Warning: Number of blockettes in fixed header (2) does not match the number parsed (0) -XFDSN:IU_COLA_00_L_H_Z, 4, 512, 112 samples, 1 Hz, 2010,058,06:50:00.069500 -Error: XFDSN:IU_COLA_00_L_H_Z: Offset to next blockette (40) is within current blockette ending at byte 64 -XFDSN:IU_COLA_00_L_H_Z, 4, 512, 185 samples, 1 Hz, 2010,058,06:51:52.069541 -Error: XFDSN:IU_COLA_00_L_H_Z: Offset to next blockette (1000) from type 1001 is beyond record length -XFDSN:IU_COLA_00_L_H_Z, 4, 512, 112 samples, 1 Hz, 2010,058,06:54:57.069539 +Error: FDSN:IU_COLA_00_L_H_Z: Unknown blockette length for type 0 +FDSN:IU_COLA_00_L_H_Z: Warning: Number of blockettes in fixed header (2) does not match the number parsed (0) +FDSN:IU_COLA_00_L_H_Z, 4, 512, 112 samples, 1 Hz, 2010,058,06:50:00.069500 +Error: FDSN:IU_COLA_00_L_H_Z: Offset to next blockette (40) is within current blockette ending at byte 64 +FDSN:IU_COLA_00_L_H_Z, 4, 512, 185 samples, 1 Hz, 2010,058,06:51:52.069541 +Error: FDSN:IU_COLA_00_L_H_Z: Offset to next blockette (1000) from type 1001 is beyond record length +FDSN:IU_COLA_00_L_H_Z, 4, 512, 112 samples, 1 Hz, 2010,058,06:54:57.069539 diff --git a/test/read-mixed-order-mixed-length-trace.test.ref b/test/read-mixed-order-mixed-length-trace.test.ref index e88558f..cc679e6 100644 --- a/test/read-mixed-order-mixed-length-trace.test.ref +++ b/test/read-mixed-order-mixed-length-trace.test.ref @@ -1,3 +1,3 @@ SourceID Start sample End sample Gap Hz Samples -XFDSN:XX_TEST_00_L_H_Z 2010,058,06:50:00.069539 2010,058,07:55:51.069539 == 1 3952 +FDSN:XX_TEST_00_L_H_Z 2010,058,06:50:00.069539 2010,058,07:55:51.069539 == 1 3952 Total: 1 trace(s) with 1 segment(s) diff --git a/test/read-no-blockette1000.test.ref b/test/read-no-blockette1000.test.ref index 00333d7..ea0732f 100644 --- a/test/read-no-blockette1000.test.ref +++ b/test/read-no-blockette1000.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__B_H_E, version 2, 4096 bytes (format: 2) +FDSN:XX_TEST__B_H_E, version 2, 4096 bytes (format: 2) start time: 1995,265,00:00:18.238400 number of samples: 3632 sample rate (Hz): 20 @@ -8,7 +8,7 @@ XFDSN:XX_TEST__B_H_E, version 2, 4096 bytes (format: 2) data payload length: 4048 bytes payload encoding: STEIM-1 integer compression (val: 10) 337 396 454 503 547 581 -XFDSN:XX_TEST__B_H_E, version 2, 4096 bytes (format: 2) +FDSN:XX_TEST__B_H_E, version 2, 4096 bytes (format: 2) start time: 1995,265,00:03:19.838500 number of samples: 3680 sample rate (Hz): 20 diff --git a/test/read-recordlist.test.ref b/test/read-recordlist.test.ref index eb6c86e..7a69ab9 100644 --- a/test/read-recordlist.test.ref +++ b/test/read-recordlist.test.ref @@ -1,4 +1,4 @@ -TraceID for XFDSN:XX_TEST_00_L_H_Z (1), segments: 1 +TraceID for FDSN:XX_TEST_00_L_H_Z (1), segments: 1 Segment 2010-02-27T06:50:00.069539000 - 2010-02-27T07:55:51.069539000, samples: 3952, sample rate: 1 Record list: RECORD: bufferptr: NULL, fileptr: NULL, filename: data/Int32-oneseries-mixedlengths-mixedorder.mseed, fileoffset: 0 diff --git a/test/read-selection.test.ref b/test/read-selection.test.ref index fc93f93..3b945cc 100644 --- a/test/read-selection.test.ref +++ b/test/read-selection.test.ref @@ -1,6 +1,6 @@ -TraceID for XFDSN:IU_COLA_00_L_H_1 (4), earliest: 2010,058,06:50:00.069539, latest: 2010,058,06:55:22.069539, segments: 1 +TraceID for FDSN:IU_COLA_00_L_H_1 (4), earliest: 2010,058,06:50:00.069539, latest: 2010,058,06:55:22.069539, segments: 1 Segment 2010,058,06:50:00.069539 - 2010,058,06:55:22.069539, samples: 323, sample rate: 1, sample type: i -TraceID for XFDSN:IU_COLA_00_L_H_2 (4), earliest: 2010,058,07:19:01.069538, latest: 2010,058,07:30:38.069536, segments: 1 +TraceID for FDSN:IU_COLA_00_L_H_2 (4), earliest: 2010,058,07:19:01.069538, latest: 2010,058,07:30:38.069536, segments: 1 Segment 2010,058,07:19:01.069538 - 2010,058,07:30:38.069536, samples: 698, sample rate: 1, sample type: i -TraceID for XFDSN:IU_COLA_00_L_H_Z (4), earliest: 2010,058,06:50:00.069539, latest: 2010,058,07:59:59.069538, segments: 1 +TraceID for FDSN:IU_COLA_00_L_H_Z (4), earliest: 2010,058,06:50:00.069539, latest: 2010,058,07:59:59.069538, segments: 1 Segment 2010,058,06:50:00.069539 - 2010,058,07:59:59.069538, samples: 4200, sample rate: 1, sample type: i diff --git a/test/read-text-encoded.test.ref b/test/read-text-encoded.test.ref index 3aaa5ac..a831c03 100644 --- a/test/read-text-encoded.test.ref +++ b/test/read-text-encoded.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST__L_O_G, 2, 4096, 3994 samples, 0 Hz, 2004,160,10:47:32.810000 +FDSN:XX_TEST__L_O_G, 2, 4096, 3994 samples, 0 Hz, 2004,160,10:47:32.810000 ASCII Data: Quanterra Packet Baler Model 14 Restart. Version 1.45 diff --git a/test/read-unapplied-timecorrection.test.ref b/test/read-unapplied-timecorrection.test.ref index d6d46b4..baa5f7f 100644 --- a/test/read-unapplied-timecorrection.test.ref +++ b/test/read-unapplied-timecorrection.test.ref @@ -1,4 +1,4 @@ -XFDSN:XX_TEST_00_B_H_Z, version 1, 4096 bytes (format: 2) +FDSN:XX_TEST_00_B_H_Z, version 1, 4096 bytes (format: 2) start time: 2003,149,02:13:23.043400 number of samples: 5980 sample rate (Hz): 40