From 2b449bc240bc223a2a3c360e244fa87158df75f0 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Tue, 29 Dec 2015 23:02:10 +0100
Subject: [PATCH] let ScanRequest do all the work

---
 src/ebusd/bushandler.cpp | 44 ++++++++++++++++++++--------------------
 src/ebusd/bushandler.h   |  9 +++++---
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 8e805342..0250ce92 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -103,7 +103,6 @@ result_t ScanRequest::prepare(unsigned char ownMasterAddress)
 bool ScanRequest::notify(result_t result, SymbolString& slave)
 {
 	unsigned char dstAddress = m_master[1];
-	ostringstream scanResult;
 	if (result == RESULT_OK) {
 		if (m_message==m_messageMap->getScanMessage()) {
 			Message* message = m_messageMap->getScanMessage(dstAddress);
@@ -120,27 +119,30 @@ bool ScanRequest::notify(result_t result, SymbolString& slave)
 				return true;
 		}
 		if (result==RESULT_OK)
-			result = m_message->decodeLastData(scanResult, 0, true); // decode data
+			result = m_message->decodeLastData(m_scanResult, 0, true); // decode data
 	}
 	if (result < RESULT_OK) {
 		if (!m_slaves.empty())
 			m_slaves.pop_front();
 		if (result == RESULT_ERR_TIMEOUT)
-			logInfo(lf_bus, "scan %2.2x timed out, %d remain", dstAddress, m_slaves.size());
+			logInfo(lf_bus, "scan %2.2x timed out (%d slaves left)", dstAddress, m_slaves.size());
 		else
-			logError(lf_bus, "scan %2.2x failed, %d remain: %s", dstAddress, m_slaves.size(), getResultCode(result));
-		m_busHandler->addScanResult(dstAddress, "", result);  // TODO combine all data from one slave and then store in BusHandler
+			logError(lf_bus, "scan %2.2x failed (%d slaves left): %s", dstAddress, m_slaves.size(), getResultCode(result));
+		m_busHandler->setScanResult(dstAddress, m_scanResult.str(), result);
 		// skip remaining secondary messages
+		m_messages.clear();
+	} else if (m_messages.empty()) {
+		m_busHandler->setScanResult(dstAddress, m_scanResult.str(), result);
+		if (!m_slaves.empty())
+			m_slaves.pop_front();
+		logNotice(lf_bus, "scan %2.2x completed (%d slaves left)", dstAddress, m_slaves.size());
+	}
+	if (m_slaves.empty())
+		return false;
+	if (m_messages.empty()) {
 		m_messages = m_allMessages;
-	} else {
-		m_busHandler->addScanResult(dstAddress, scanResult.str(), result);
-		// check for remaining secondary messages
-		if (m_messages.empty()) {
-			if (!m_slaves.empty())
-				m_slaves.pop_front();
-			logNotice(lf_bus, "scan %2.2x completed, %d remain", dstAddress, m_slaves.size());
-			m_messages = m_allMessages;
-		}
+		m_scanResult.str("");
+		m_scanResult.clear();
 	}
 	m_index = 0;
 	m_message = m_messages.front();
@@ -847,19 +849,17 @@ result_t BusHandler::startScan(bool full)
 	return RESULT_OK;
 }
 
-void BusHandler::addScanResult(unsigned char dstAddress, string str, result_t result)
+void BusHandler::setScanResult(unsigned char dstAddress, string str, result_t result)
 {
 	if (result==RESULT_ERR_NO_SIGNAL)
 		return;
 	m_seenAddresses[dstAddress] |= SCAN_INIT;
-	if (result!=RESULT_OK)
-		return;
-	m_seenAddresses[dstAddress] |= SCAN_DONE;
-	logNotice(lf_bus, "scan %2.2x: %s", dstAddress, str.c_str());
-	if (m_scanResults.find(dstAddress) == m_scanResults.end())
+	if (result==RESULT_OK) {
+		m_seenAddresses[dstAddress] |= SCAN_DONE;
+		logNotice(lf_bus, "scan %2.2x: %s", dstAddress, str.c_str());
+	}
+	if (str.length()>0)
 		m_scanResults[dstAddress] = str;
-	else
-		m_scanResults[dstAddress] += str;
 }
 
 void BusHandler::formatScanResult(ostringstream& output)
diff --git a/src/ebusd/bushandler.h b/src/ebusd/bushandler.h
index 732446c4..b6e86e94 100644
--- a/src/ebusd/bushandler.h
+++ b/src/ebusd/bushandler.h
@@ -244,6 +244,9 @@ private:
 	/** the slave addresses to scan. */
 	deque<unsigned char> m_slaves;
 
+	/** the @a ostringstream for building the scan result of a single slave. */
+	ostringstream m_scanResult;
+
 	/** the @a BusHandler instance to notify of final scan result. */
 	BusHandler* m_busHandler;
 
@@ -360,12 +363,12 @@ public:
 	result_t startScan(bool full=false);
 
 	/**
-	 * Add a scan result @a string for a scanned slave address.
+	 * Set the scan result @a string for a scanned slave address.
 	 * @param dstAddress the scanned slave address.
-	 * @param str the scan result @a string to add.
+	 * @param str the scan result @a string to set.
 	 * @param result the scan result code.
 	 */
-	void addScanResult(unsigned char dstAddress, string str, result_t result);
+	void setScanResult(unsigned char dstAddress, string str, result_t result);
 
 	/**
 	 * Format the scan result to the @a ostringstream.