From f73be4ffdc650fd107881c59abec250c85440da8 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Sat, 17 Dec 2022 10:57:17 -0600 Subject: [PATCH] rss expanded integration pass --- src/oned/rss/expanded/rss_expanded_reader.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/oned/rss/expanded/rss_expanded_reader.rs b/src/oned/rss/expanded/rss_expanded_reader.rs index 3500fbe..a8a953f 100644 --- a/src/oned/rss/expanded/rss_expanded_reader.rs +++ b/src/oned/rss/expanded/rss_expanded_reader.rs @@ -160,10 +160,15 @@ impl OneDReader for RSSExpandedReader { self.pairs.clear(); self.startFromEven = false; // try { - let possible = Self::constructRXingResult(&self.decodeRow2pairs(rowNumber, row)?); - if possible.is_ok() { - return possible; - } + if let Ok(decoded_two_pairs) = self.decodeRow2pairs(rowNumber, row) { + if let Ok(possible_result) = Self::constructRXingResult(&decoded_two_pairs) { + return Ok(possible_result) + } + } + // let possible = Self::constructRXingResult(&self.decodeRow2pairs(rowNumber, row)?); + // if possible.is_ok() { + // return possible; + // } // } catch (NotFoundException e) { // OK // }