Omit the leading "./" in output filenames if output goes into the current

directory.
This makes downloading such output files via the web interface nicer
because they doen't have any special characters in it.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@46 94b1c47f-dcfd-45ef-a468-0854c0e9e350

2 files changed, 40 insertions, 10 deletions

diff --git a/src/Write1D.c b/src/Write1D.c
index ac651da..8912cce 100644
--- a/src/Write1D.c
+++ b/src/Write1D.c
@@ -101,7 +101,6 @@ CCTK_FILEVERSION(CactusBase_IOASCII_Write1D_c)
    @vio     in
    @endvar 
 @@*/
-
 void IOASCII_Write1D (cGH *GH, int vindex, const char *alias)
 { 
   DECLARE_CCTK_PARAMETERS
@@ -278,13 +277,30 @@ void IOASCII_Write1D (cGH *GH, int vindex, const char *alias)
           sprintf (slicename, "%s%dD_diagonal", type_extension,
                    group_static_data.dim);
         }
-        sprintf (filename, "%s/%s_%s%s", myGH->outdir1D, alias,
-                 slicename, file_extension);
+
+        /* skip the pathname if output goes into current directory */
+        if (strcmp (myGH->outdir1D, "."))
+        {
+          sprintf (filename, "%s/%s_%s%s", myGH->outdir1D, alias,
+                   slicename, file_extension);
+        }
+        else
+        {
+          sprintf (filename, "%s_%s%s", alias, slicename, file_extension);
+        }
       }
       else
       {
-        sprintf (filename, "%s/%s%s.%s", myGH->outdir1D, alias,
-                 type_extension, extensions[i % 4]);
+        /* skip the pathname if output goes into current directory */
+        if (strcmp (myGH->outdir1D, "."))
+        {
+          sprintf (filename, "%s/%s_%s%s", myGH->outdir1D, alias,
+                   type_extension, extensions[i % 4]);
+        }
+        else
+        {
+          sprintf (filename, "%s_%s%s", alias, type_extension, extensions[i%4]);
+        }
       }
 #endif
 
@@ -579,5 +595,4 @@ void IOASCII_Write1D (cGH *GH, int vindex, const char *alias)
     }
     
   } /* end of loop through all directions */
-
 }
diff --git a/src/Write2D.c b/src/Write2D.c
index 328243a..f4f8909 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -194,12 +194,28 @@ FIXME: get rid of PUGH here
           sprintf (slicename, "%s_[%d]", extensions[dir],
                    myGH->sp2xyz[groupinfo.dim - 1][dir] + 1);
 
-          sprintf (filename, "%s/%s_%s.asc", myGH->outdir2D, alias, slicename);
+          /* skip pathname if output goes into current directory */
+          if (strcmp (myGH->outdir2D, "."))
+          {
+            sprintf (filename, "%s/%s_%s.asc", myGH->outdir2D, alias,slicename);
+          }
+          else
+          {
+            sprintf (filename, "%s_%s.asc", alias, slicename);
+          }
         }
         else
         {
-          sprintf (filename, "%s/%s_2d_%s.gnuplot", myGH->outdir2D, alias,
-                   extensions[dir]);
+          /* skip pathname if output goes into current directory */
+          if (strcmp (myGH->outdir2D, "."))
+          {
+            sprintf (filename, "%s/%s_2d_%s.gnuplot", myGH->outdir2D, alias,
+                     extensions[dir]);
+          }
+          else
+          {
+            sprintf (filename, "%s_2d_%s.gnuplot", alias, extensions[dir]);
+          }
         }
 #endif
 
@@ -437,5 +453,4 @@ FIXME: get rid of PUGH here
     } /* end of outputting the data by processor 0 */
 
   } /* end of looping through xyz directions */
-
 }