tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
dockes 2008-05-08 09:57:29 +00:00
parent 1977c41a99
commit 387a5de294
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/utils/smallut.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: smallut.cpp,v 1.27 2007-10-19 15:25:19 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: smallut.cpp,v 1.28 2008-05-08 09:57:29 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -168,8 +168,7 @@ bool samecharset(const string &cs1, const string &cs2)
return mcs1 == mcs2; return mcs1 == mcs2;
} }
template <class T> bool stringToStrings(const string &s, T &tokens)
bool stringToStrings(const string &s, std::list<string> &tokens)
{ {
string current; string current;
tokens.clear(); tokens.clear();
@ -258,10 +257,18 @@ bool stringToStrings(const string &s, std::list<string> &tokens)
} }
return true; return true;
} }
bool stringToStrings(const string &s, list<string> &tokens)
void stringsToString(const list<string> &tokens, string &s)
{ {
for (list<string>::const_iterator it = tokens.begin(); return stringToStrings<list<string> >(s, tokens);
}
bool stringToStrings(const string &s, vector<string> &tokens)
{
return stringToStrings<vector<string> >(s, tokens);
}
template <class T> void stringsToString(const T &tokens, string &s)
{
for (typename T::const_iterator it = tokens.begin();
it != tokens.end(); it++) { it != tokens.end(); it++) {
bool hasblanks = false; bool hasblanks = false;
if (it->find_first_of(" \t\n") != string::npos) if (it->find_first_of(" \t\n") != string::npos)
@ -283,6 +290,14 @@ void stringsToString(const list<string> &tokens, string &s)
s.append(1, '"'); s.append(1, '"');
} }
} }
void stringsToString(const list<string> &tokens, string &s)
{
stringsToString<list<string> >(tokens, s);
}
void stringsToString(const vector<string> &tokens, string &s)
{
stringsToString<vector<string> >(tokens, s);
}
void stringToTokens(const string& str, list<string>& tokens, void stringToTokens(const string& str, list<string>& tokens,
const string& delims, bool skipinit) const string& delims, bool skipinit)

7
src/utils/smallut.h
View File

@ -16,14 +16,16 @@
*/ */
#ifndef _SMALLUT_H_INCLUDED_ #ifndef _SMALLUT_H_INCLUDED_
#define _SMALLUT_H_INCLUDED_ #define _SMALLUT_H_INCLUDED_
/* @(#$Id: smallut.h,v 1.27 2007-05-21 12:03:52 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: smallut.h,v 1.28 2008-05-08 09:57:29 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
#include <list> #include <list>
#include <vector>
#include <map> #include <map>
#ifndef NO_NAMESPACES #ifndef NO_NAMESPACES
using std::string; using std::string;
using std::list; using std::list;
using std::vector;
using std::map; using std::map;
#endif /* NO_NAMESPACES */ #endif /* NO_NAMESPACES */
@ -45,10 +47,13 @@ extern bool samecharset(const string &cs1, const string &cs2);
* dquotes can be escaped with \ etc... * dquotes can be escaped with \ etc...
*/ */
extern bool stringToStrings(const string &s, list<string> &tokens); extern bool stringToStrings(const string &s, list<string> &tokens);
extern bool stringToStrings(const string &s, vector<string> &tokens);
/** /**
* Inverse operation: * Inverse operation:
*/ */
extern void stringsToString(const list<string> &tokens, string &s); extern void stringsToString(const list<string> &tokens, string &s);
extern void stringsToString(const vector<string> &tokens, string &s);
/** /**
* Split input string. No handling of quoting * Split input string. No handling of quoting