[ObjectHandler-cvs] ObjectHandler/oh utilities.cpp, 1.11, 1.12 utilities.hpp, 1.8, 1.9

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18949/oh

Modified Files:
	utilities.cpp utilities.hpp 
Log Message:
allow user to specify delimiter for ohParseField()

Index: utilities.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** utilities.cpp	3 Jul 2006 08:19:26 -0000	1.11
--- utilities.cpp	12 Jul 2006 14:02:23 -0000	1.12
***************
*** 85,94 ****
      std::vector<std::string> split(
              const std::string &line,
!             unsigned int maxRequired) {
          std::vector<std::string> ret;
          std::string::const_iterator start = line.begin();
          std::string::const_iterator end = line.end();
          boost::match_results<std::string::const_iterator> m;
!         static const boost::regex r("[^[:space:]]+");
          while (maxRequired-- && boost::regex_search(start, end, m, r)) {
              ret.push_back(std::string(m[0].first, m[0].second));
--- 85,95 ----
      std::vector<std::string> split(
              const std::string &line,
!             unsigned int maxRequired,
!             const std::string &delim) {
          std::vector<std::string> ret;
          std::string::const_iterator start = line.begin();
          std::string::const_iterator end = line.end();
          boost::match_results<std::string::const_iterator> m;
!         boost::regex r("[^" + delim + "]+");
          while (maxRequired-- && boost::regex_search(start, end, m, r)) {
              ret.push_back(std::string(m[0].first, m[0].second));

Index: utilities.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** utilities.hpp	3 Jul 2006 08:19:26 -0000	1.8
--- utilities.hpp	12 Jul 2006 14:02:23 -0000	1.9
***************
*** 84,88 ****
      std::vector<std::string> split(
              const std::string &line,
!             unsigned int maxRequired);
      std::string uppercase(const std::string& s);
  
--- 84,89 ----
      std::vector<std::string> split(
              const std::string &line,
!             unsigned int maxRequired,
!             const std::string &delim);
      std::string uppercase(const std::string& s);