2004-09-23 Jean-Pierre Roux

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 649f98931c97b482af7a5ffd10ef2ec7d05d2a7a..ec96d5321b2941bf1cdcbc611d448212c812464b 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 03:36:24 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2004/09/07 14:11:57 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,6 +54,29 @@ void Tokenize (const std::string& str,
    }
 }
 
+/**
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ *        Counts the number of occurences of a substring within a string
+ */
+ 
+ int CountSubstring (const std::string& str,
+                     const std::string& subStr) {
+   int count = 0;   // counts how many times it appears
+   unsigned int x = 0;       // The index position in the string
+
+   do
+    { x = str.find(subStr,x);       // Find the substring
+      if (x != std::string::npos)   // If present
+        { count++;                  // increase the count
+          x += subStr.length();     // Skip this word
+        }
+    }
+   while (x != std::string::npos);  // Carry on until not present
+
+   return count;
+}
+
 /**
  * \ingroup Globals
  * \brief  Weed out a string from the non-printable characters (in order
@@ -102,12 +125,16 @@ void NormalizePath(std::string &name)
  */
 std::string GetPath(std::string &fullName)
 {
-   int pos1=fullName.rfind("/");
-   int pos2=fullName.rfind("\\");
-   if(pos1>pos2)
+   int pos1 = fullName.rfind("/");
+   int pos2 = fullName.rfind("\\");
+   if( pos1 > pos2)
+   {
       fullName.resize(pos1);
+   }
    else
+   {
       fullName.resize(pos2);
+   }
    return fullName;
 }
 
@@ -123,7 +150,7 @@ std::string GetName(std::string &fullName)
   if (a == '/' || a == '\\') {
      fin--;
   }
-  int deb;
+  int deb = 0;
   for (int i=fin;i!=0;i--) {
      if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\')  
         break;