Changeset 1902 for trunk/MagicSoft/Mars/mfileio

Timestamp:

04/03/03 15:37:41 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfileio/MRead.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mfileio/MRead.cc

@@ -56 +56 @@
 {
     //
-    // Don't allow 'global' setup of files
-    //
-    if (prefix.IsNull())
-        return kFALSE;
-
-    //
     // Search (beginning with 0) all keys
     //
-    for (int i=0;; i++)
+    int i=0;
+    while (1)
     {
         TString idx = "File";
@@ -70 +65 @@
 
         // Output if print set to kTRUE
-        IsEnvDefined(env, prefix, idx, print);
+        if (!IsEnvDefined(env, prefix, idx, print))
+            break;
 
         // Try to get the file name
         TString name = GetEnvValue(env, prefix, idx, "");
         if (name.IsNull())
-            break;
+        {
+            *fLog << warn << prefix+"."+idx << " empty." << endl;
+            continue;
+        }
 
         if (name.BeginsWith("\"") && name.EndsWith("\""))
@@ -83 +82 @@
         }
 
-        if (print)
-            *fLog << all << "Add File: " << name << endl;
+        *fLog << inf << "Add File: " << name << endl;
+
         AddFile(name);
+        i++;
     }
 
-    return kTRUE;
+    return i!=0;
 }