Skip to content

Commit 0e404a3

Browse files
committed
seisFile 2.0 uses Instant, start and lastSampleBTime should be called on DataRecord instead of DataHeader in case there is a Blockette100
1 parent 9a43d6f commit 0e404a3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/edu/iris/wss/endpoints/CmdProcessor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,8 @@ public void writeMiniSeed(OutputStream output) {
700700
Status.OK, epName, LogKey.getNetwork(key).trim(),
701701
LogKey.getStation(key).trim(), LogKey.getLocation(key).trim(),
702702
LogKey.getChannel(key).trim(), LogKey.getQuality(key).trim(),
703-
rmd.getStart().convertToCalendar().getTime(),
704-
rmd.getEnd().convertToCalendar().getTime(), epName);
703+
Date.from(rmd.getStart().toInstant()),
704+
Date.from(rmd.getEnd().toInstant()), epName);
705705
}
706706
} catch (Exception ex) {
707707
logger.error("Error logging MiniSEED response for record count: "
@@ -769,14 +769,14 @@ private void processRecord(SeedRecord sr,
769769
RecordMetaData rmd = logHash.get(key);
770770

771771
if (rmd != null) {
772-
rmd.setIfEarlier(dh.getStartBtime());
773-
rmd.setIfLater(dh.getLastSampleBtime());
772+
rmd.setIfEarlier(dr.getStartBtime());
773+
rmd.setIfLater(dr.getLastSampleBtime());
774774
rmd.setSize(rmd.getSize() + (long) dr.getRecordSize());
775775
} else {
776776
rmd = new RecordMetaData();
777777
rmd.setSize((long) dr.getRecordSize());
778-
rmd.setIfEarlier(dh.getStartBtime());
779-
rmd.setIfLater(dh.getLastSampleBtime());
778+
rmd.setIfEarlier(dr.getStartBtime());
779+
rmd.setIfLater(dr.getLastSampleBtime());
780780
logHash.put(key, rmd);
781781
}
782782
/*

0 commit comments

Comments
 (0)