foo

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index 16fa870034b7532bf882a82402e4946c91d0972d..92e7ef84265fa85a263e91835d4bd756863c1ceb 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -5,6 +5,7 @@
 #include <wx/imaglist.h>
 #include <wx/treectrl.h>
 #include <wx/toolbar.h>
+#include <wx/tokenzr.h>
 #include <wxhtml/wxhtml.h>
 
 

diff --git a/daphne/utils.cpp b/daphne/utils.cpp
index bf7d068d3ea552d2ec35f420f8160d515dc3bad6..c171aefd1e28319305f020ba6a86b9c3b3ec7ac1 100644 (file)
--- a/daphne/utils.cpp
+++ b/daphne/utils.cpp
@@ -6,22 +6,15 @@
 // Extract a field from a string returned by the server
 //
 void extract(wxString& outputbuf, wxString inputbuf, int parmnum) {
-       int a;
-       int p;
-       
-       outputbuf = inputbuf;
+       int i;
+       wxStringTokenizer *tok = new wxStringTokenizer(inputbuf, "|", FALSE);
 
-       for (a=0; a<parmnum; ++a) {
-               p = outputbuf.First('|');
-               if (p >= 0) {
-                       outputbuf = outputbuf.Mid(p+1);
+       for (i=0; tok->HasMoreToken(); ++i) {
+               outputbuf = tok->NextToken();
+               if (i == parmnum) {
+                       return;
                }
        }
-
-       p = outputbuf.First('|');
-       if (p > 0) {
-               outputbuf = outputbuf.Left(p);
-       }
 }
 
 int extract_int(wxString inputbuf, int parmnum) {