Include :
- aggiunte funzioni Set/Get/RemoveValInNotes - aggiornati prototipi e costanti - for each (.. in ..) sostituito da for ( .. : ..) vero costrutto C++.
This commit is contained in:
+95
-9
@@ -1,13 +1,13 @@
|
||||
//----------------------------------------------------------------------------
|
||||
// EgalTech 2015-2015
|
||||
// EgalTech 2015-2018
|
||||
//----------------------------------------------------------------------------
|
||||
// File : EGnStringKeyVal.h Data : 23.05.15 Versione : 1.6e3
|
||||
// File : EGnStringKeyVal.h Data : 27.11.18 Versione : 1.9k1
|
||||
// Contenuto : Funzioni per gestione coppie chiave-valore in stringhe.
|
||||
//
|
||||
//
|
||||
//
|
||||
// Modifiche : 23.05.15 DS Creazione modulo.
|
||||
//
|
||||
// 27.11.18 DS Aggiunte Set/Get/RemoveValInNotes.
|
||||
//
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
@@ -20,19 +20,19 @@ static const char EQUAL = '=' ;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
inline bool
|
||||
IsValidKey( const std::string& sString)
|
||||
IsValidKey( const std::string& sKey)
|
||||
{
|
||||
return ( ! sString.empty() &&
|
||||
sString.find( '\n') == std::string::npos &&
|
||||
sString.find( EQUAL) == std::string::npos &&
|
||||
sString.find_first_not_of( " \t\r\n") != std::string::npos) ;
|
||||
return ( ! sKey.empty() &&
|
||||
sKey.find( '\n') == std::string::npos &&
|
||||
sKey.find( EQUAL) == std::string::npos &&
|
||||
sKey.find_first_not_of( " \t\r\n") != std::string::npos) ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
inline bool
|
||||
FindKey( const std::string& sString, const std::string& sKey)
|
||||
{
|
||||
if ( ! IsValidKey( sKey))
|
||||
if ( sString.empty() || ! IsValidKey( sKey))
|
||||
return false ;
|
||||
return ( sString.compare( 0, sKey.length(), sKey) == 0 &&
|
||||
sString.length() > sKey.length() &&
|
||||
@@ -94,3 +94,89 @@ GetVal( const std::string& sString, const std::string& sKey, T& Val)
|
||||
std::string sVal ;
|
||||
return ( GetVal( sString, sKey, sVal) && FromString( sVal, Val)) ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
inline bool
|
||||
SetValInNotes( const std::string& sKey, const std::string& sVal, std::string& sNotes)
|
||||
{
|
||||
if ( ! IsValidKey( sKey) || ! IsValidVal( sVal))
|
||||
return false ;
|
||||
STRVECTOR vsTokens ;
|
||||
Tokenize( sNotes, ";", vsTokens) ;
|
||||
bool bFound = false ;
|
||||
for ( auto& sToken : vsTokens) {
|
||||
if ( FindKey( sToken, sKey)) {
|
||||
sToken = sKey + EQUAL + sVal ;
|
||||
bFound = true ;
|
||||
break ;
|
||||
}
|
||||
}
|
||||
if ( ! bFound)
|
||||
vsTokens.emplace_back( sKey + EQUAL + sVal) ;
|
||||
sNotes.clear() ;
|
||||
for ( const auto& sToken : vsTokens) {
|
||||
if ( ! IsEmptyOrSpaces( sToken))
|
||||
sNotes += sToken + ";" ;
|
||||
}
|
||||
return true ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
template <class T>
|
||||
inline bool
|
||||
SetValInNotes( const std::string& sKey, T& Val, std::string& sNotes)
|
||||
{
|
||||
return SetValInNotes( sKey, ToString( Val), sNotes) ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
inline bool
|
||||
GetValInNotes( const std::string& sNotes, const std::string& sKey, std::string& sVal)
|
||||
{
|
||||
if ( sNotes.empty() || ! IsValidKey( sKey))
|
||||
return false ;
|
||||
STRVECTOR vsTokens ;
|
||||
Tokenize( sNotes, ";", vsTokens) ;
|
||||
for ( const auto& sToken : vsTokens) {
|
||||
if ( FindKey( sToken, sKey)) {
|
||||
sVal = sToken.substr( sKey.length() + 1) ;
|
||||
return true ;
|
||||
}
|
||||
}
|
||||
return false ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
template <class T>
|
||||
inline bool
|
||||
GetValInNotes( const std::string& sNotes, const std::string& sKey, T& Val)
|
||||
{
|
||||
std::string sVal ;
|
||||
return ( GetValInNotes( sNotes, sKey, sVal) && FromString( sVal, Val)) ;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
inline bool
|
||||
RemoveValInNotes( const std::string& sKey, std::string& sNotes)
|
||||
{
|
||||
if ( sNotes.empty() || ! IsValidKey( sKey))
|
||||
return false ;
|
||||
STRVECTOR vsTokens ;
|
||||
Tokenize( sNotes, ";", vsTokens) ;
|
||||
bool bFound = false ;
|
||||
for ( size_t i = 0; i < vsTokens.size() ; ++ i) {
|
||||
if ( FindKey( vsTokens[i], sKey)) {
|
||||
vsTokens.erase( vsTokens.begin() + i) ;
|
||||
bFound ;
|
||||
break ;
|
||||
}
|
||||
}
|
||||
if ( bFound) {
|
||||
sNotes.clear() ;
|
||||
for ( const auto& sToken : vsTokens) {
|
||||
if ( ! IsEmptyOrSpaces( sToken))
|
||||
sNotes += sToken + ";" ;
|
||||
}
|
||||
}
|
||||
return true ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user