From 8fa5df5f89ba12a2e0a6d277829a87964151553f Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2019 10:00:11 -0400
Subject: [PATCH] Fix PRS1 typo, resolve use of multiple event lists and refine
 warning.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp |  4 ++--
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  2 +-
 oscar/tests/sessiontests.cpp                  | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 48bb632d..9d3131d8 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -4319,7 +4319,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
 }
 
 
-bool PRS1Import::ParseOximetery()
+bool PRS1Import::ParseOximetry()
 {
     int size = oximetry.size();
 
@@ -4506,7 +4506,7 @@ bool PRS1Import::ParseSession(void)
         // Parse .006 Waveform file
         oximetry = loader->ParseFile(oxifile);
         oximetry = CoalesceWaveformChunks(oximetry);
-        ParseOximetery();
+        ParseOximetry();
 
         if (session->first() > 0) {
             if (session->last() < session->first()) {
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index b1edf308..43b9c517 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -249,7 +249,7 @@ public:
     bool ParseWaveforms();
 
     //! \brief Takes the parsed list of oximeter waveform chunks and adds them to the database.
-    bool ParseOximetery();
+    bool ParseOximetry();
 
 
     //! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index e260c116..5b12d537 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -230,13 +230,23 @@ void SessionToYaml(QString filepath, Session* session)
         // Note that this is a vector of lists
         QVector<EventList *> &ev = session->eventlist[*key];
         int ev_size = ev.size();
+        if (ev_size == 0) {
+            continue;
+        }
+        EventList &e = *ev[0];
         
-        // TODO: See what this actually signifies. Some waveform data seems to have to multiple event lists,
-        // which might reflect blocks within the original files, or something else.
-        if (ev_size > 2) qDebug() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
+        // Multiple eventlists in a channel are used to account for discontiguous data.
+        // See CoalesceWaveformChunks for the coalescing of multiple contiguous waveform
+        // chunks and ParseWaveforms/ParseOximetry for the creation of eventlists per
+        // coalesced chunk.
+        //
+        // TODO: Is this only for waveform data?
+        if (ev_size > 1 && e.type() != EVL_Waveform) {
+            qWarning() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
+        }
 
         for (int j = 0; j < ev_size; j++) {
-            EventList &e = *ev[j];
+            e = *ev[j];
             out << "    - count: "  << (qint32)e.count() << endl;
             if (e.count() == 0)
                 continue;