Changeset 19626 for trunk

Timestamp:

09/05/19 11:31:30 (5 years ago)

Author:

tbretz

Message:

Added the possibility to use only one column in a file which is read with ReadFile

File:

• trunk/Mars/mbase/MDirIter.cc (modified) (1 diff)

trunk/Mars/mbase/MDirIter.cc

@@ -207 +207 @@
         TObjArray &arr = *line.Tokenize(' ');
 
-        for (int i=1; i<arr.GetEntries(); i++)
-            rc += AddDirectory(arr[0]->GetName(), arr[i]->GetName(), -1);
+        if (arr.GetEntries()==1)
+        {
+            // FIXME: Check for wildcards
+            const TString file = arr[0]->GetName();
+            const Ssiz_t p = file.Last('/');
+
+            if (p<=0)
+                rc += AddDirectory(".", arr[0]->GetName(), 0);
+            else
+                rc += AddDirectory(TString(file(0, p)), file.Data()+p+1, 0);
+        }
+        else
+        {
+            for (int i=1; i<arr.GetEntries(); i++)
+                rc += AddDirectory(arr[0]->GetName(), arr[i]->GetName(), -1);
+        }
 
         delete &arr;