Changeset 5299

Timestamp:

10/20/04 17:36:04 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MDirIter.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
    * mhist/MHCamera.cc:
      - fixed returning GetBinError for kProfile mode switched on
+
+   * mbase/MDirIter.cc:
+     - fixed a bug in the Sort function: AddDirectory was incorrectly used
 
 

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -377 +377 @@
     TObject *o=0;
     while ((o=NextN()))
-           AddDirectory(o->GetName());
-}
+    {
+        TString dir  = o->GetName();
+        TString name = o->GetName();
+
+        const Int_t last = dir.Last('/');
+        if (last<0)
+            continue;
+
+        dir.Remove(last);
+        name.Remove(0, last+1);
+
+        AddDirectory(dir, name);
+    }
+}