reintroduce testing

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index a2c491cc6d14722d7fd12f2ac533e6badee68f64..c6a9d0365d3f24bd109a49ed64acd5da43632638 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -5,98 +5,7 @@
 #include <stdio.h>
 #include <ctype.h>   // For isspace
 #include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
-
-/**
- * \ingroup Globals
- * \brief Pointer to a container, holding _all_ the Dicom Dictionaries.
- */
-gdcmDictSet         *gdcmGlobal::Dicts  = (gdcmDictSet *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to a hash table containing the 'Value Representations'.
- */
-gdcmVR              *gdcmGlobal::VR     = (gdcmVR *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to a hash table containing the Transfer Syntax codes
- *          and their english description 
- */
-gdcmTS              *gdcmGlobal::TS     = (gdcmTS *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to the hash table containing the Dicom Elements
- *          necessary to describe each part of a DICOMDIR 
- */
-gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
-
-/**
- * \ingroup Globals
- * \brief   Global container
- */
-gdcmGlobal gdcmGlob;
-
-/**
- * \ingroup gdcmGlobal
- * \brief   constructor : populates the various H Tables
- */
-gdcmGlobal::gdcmGlobal(void) {
-   if (VR || TS || Dicts || ddElem)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
-   Dicts  = new gdcmDictSet();
-   VR     = new gdcmVR();
-   TS     = new gdcmTS();
-   ddElem = new gdcmDicomDirElement();
-}
-
-/**
- * \ingroup gdcmGlobal
- * \brief   canonical destructor 
- */
-gdcmGlobal::~gdcmGlobal() {
-   delete Dicts;
-   delete VR;
-   delete TS;
-   delete ddElem;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief   returns a pointer to the 'Value Representation Table' 
- */
-gdcmVR *gdcmGlobal::GetVR(void) {
-   return VR;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief   returns a pointer to the 'Transfert Syntax Table' 
- */
-gdcmTS *gdcmGlobal::GetTS(void) {
-   return TS;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief   returns a pointer to Dictionaries Table 
- */
-gdcmDictSet *gdcmGlobal::GetDicts(void) {
-   return Dicts;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief   returns a pointer to the DicomDir related elements Table 
- */
-gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
-   return ddElem;
-}
-
-/**
- * \defgroup Globals Utility functions
- * \brief    Here are some utility functions, belonging to NO class,
- *           dealing with strings, file names... that can be called
- *           from anywhere by whomsoever they can help.
- */
-
+#include <iostream>
 
 /**
  * \ingroup Globals
@@ -133,30 +42,12 @@ void Tokenize (const std::string& str,
  * \ingroup Globals
  * \brief  Weed out a string from the non-printable characters (in order
  *         to avoid corrupting the terminal of invocation when printing)
- * @param v characters array to remove non printable characters from
- */
-char *_cleanString(char *v) {
-   char *d;
-   int i, l;
-   l = strlen(v);
-   for (i=0,d=v; 
-      i<l ; 
-      i++,d++) {
-         if (!isprint(*d))
-         *d = '.';
-   }
-   return v;
-}
-
-/**
- * \ingroup Globals
- * \brief   to prevent a flashing screen when non-printable character
  * @param s string to remove non printable characters from
  */
-std::string _CreateCleanString(std::string s) {
+std::string CreateCleanString(std::string s) {
    std::string str=s;
 
-   for(int i=0;i<str.size();i++)
+   for(unsigned int i=0;i<str.size();i++)
    {
       if(!isprint(str[i]))
          str[i]='.';