From 4732a64e9365ee7d7cc315916a11fd889d945b3e Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 10 Oct 2017 07:48:55 +0000
Subject: [PATCH] =?UTF-8?q?EgtGeneral=201.8j1=20:=20-=20in=20Tokenize=20co?=
 =?UTF-8?q?n=20separatore=20spazio=20pi=C3=B9=20spazi=20sono=20considerati?=
 =?UTF-8?q?=20come=20uno=20solo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgtGeneral.rc   | Bin 11630 -> 11638 bytes
 StringUtils.cpp |   8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/EgtGeneral.rc b/EgtGeneral.rc
index a12e7b0cef647510199f02e499c014b6f939b9cf..21816ada9faa7ddfa9880adcad2a5b297f872834 100644
GIT binary patch
delta 110
zcmaDC^(|_{H#TNN27}G3#m+NLekZImIY5wO@-I#q#;nc%1v42pH*h;KLlsyvg9TT!
Vpz^aBHwQ^Oz!YIOMMgP@3jmF-C3*k=

delta 118
zcmews^)70|H#SC#%^SteGfloDtuy(apbB#agW=?jg1Vb!q^uY>H*q^LgB4gaBT3jW
TZq5^Sz#>t@g4Z+^<sdEqVwoj~

diff --git a/StringUtils.cpp b/StringUtils.cpp
index 2669d32..f7a847c 100644
--- a/StringUtils.cpp
+++ b/StringUtils.cpp
@@ -303,8 +303,12 @@ Tokenize( const string& sString, const string& sSeparators, STRVECTOR& vsTokens)
    while ( iPosStart != string::npos) {
      // cerco il primo separatore
       string::size_type iPosEnd = sString.find_first_of( sSeparators, iPosStart) ;
-     // aggiungo il token al vettore
-      vsTokens.push_back( sString.substr( iPosStart, iPosEnd - iPosStart)) ;
+     // se arrivato alla fine, aggiungo il token al vettore
+      if ( iPosEnd == string::npos)
+         vsTokens.push_back( sString.substr( iPosStart)) ;
+     // altrimenti aggiungo se separatore diverso da spazio o risultato non vuoto
+      else if ( sString[iPosEnd] != ' '  ||  iPosEnd > iPosStart)
+         vsTokens.push_back( sString.substr( iPosStart, iPosEnd - iPosStart)) ;
      // cerco l'inizio di un nuovo token
       iPosStart = ( iPosEnd != string::npos ? iPosEnd + 1 : string::npos) ;
    }