Made separator configurable.

Author: dreibh

src/combinesummaries.1

@@ -41,6 +41,8 @@ output_file
 .br
 .Op Fl c Ar level | Fl Fl compress Ar level
 .br
+.Op Fl s Ar separator | Fl Fl separator Ar separator
+.br
 .Op Fl n | Fl Fl line-numbers
 .br
 .Op Fl q | Fl Fl quiet
@@ -73,6 +75,8 @@ The name of the output file to be created.
 A space-separated list of output variable names to be added to the output data tables.
 .It Fl c Ar level | Fl Fl compress Ar level
 Sets the BZip2 compression level; 1=none, 9=highest (default).
+.It Fl s Ar separator | Fl Fl separator Ar separator
+Sets the separator for the tables. Default: tabulator character (i.e. $'\t').
 .It Fl n | Fl Fl line-numbers
 Generate line numbers for output rows (GNU R: row names). In this case, the input files must contain line numbers (GNU R: row names) as well! The original line numbers are kept in column SubLineNo. Default: off.
 .It Fl quiet
@@ -85,10 +89,10 @@ v1.data.bz2 (created with ParameterY=Alpha) and
 v2.data.bz2 (created with ParameterY=Beta).
 The output data table should be written to output.data.bz2.
 .br
-( echo "\-\-values=\\"Alpha\\""   && \\
-  echo "\-\-input=v1.data.bz2"  && \\
-  echo "\-\-values=\\"Beta\\""    && \\
-  echo "\-\-input=v2.data.bz2" ) | combinesummaries output.data.bz2 "ParameterY"
+( echo -e "\-\-values=\\"Alpha\\"\\t\\"Test 1\\"" && \\
+  echo "\-\-input=v1.data.bz2"               && \\
+  echo -e "\-\-values=\\"Beta\\"\\t\\"Test 2\\""  && \\
+  echo "\-\-input=v2.data.bz2" ) | combinesummaries output.data.bz2 $'ParameterX\\tParameterY'
 .\" ###### Authors ##########################################################
 .Sh AUTHORS
 Thomas Dreibholz

src/combinesummaries.cc

@@ -66,7 +66,8 @@ void addDataFile(OutputFile&         outputFile,
                  unsigned long long& outputLineNumber,
                  const std::string&  varNames,
                  const std::string&  varValues,
-                 const std::string&  inputFileName)
+                 const std::string&  inputFileName,
+                 const char*         separator = "\t")
 {
    // ====== Open input file ================================================
    InputFile       inputFile;
@@ -93,15 +94,17 @@ void addDataFile(OutputFile&         outputFile,
       if(withLineNumbers) {
          if(inputFile.getLine() == 1) {
             if(outputLineNumber == 0) {
-               if(outputFile.printf("%s SubLineNo %s\n", varNames.c_str(), buffer) == false) {
+               if(outputFile.printf("%s%sSubLineNo%s%s\n", varNames.c_str(), separator, separator, buffer) == false) {
                   outputFile.finish();
                   exit(1);
                }
             }
          }
          else {
-            if(outputFile.printf("%06llu %s %s\n",
-                                 outputLineNumber, varValues.c_str(), buffer) == false) {
+            if(outputFile.printf("%06llu%s%s%s%s\n",
+                                 outputLineNumber, separator,
+                                 varValues.c_str(), separator,
+                                 buffer) == false) {
                outputFile.finish();
                exit(1);
             }
@@ -110,14 +113,14 @@ void addDataFile(OutputFile&         outputFile,
       else {
          if(inputFile.getLine() == 1) {
             if(outputLineNumber == 0) {
-               if(outputFile.printf("%s %s\n", varNames.c_str(), buffer) == false) {
+               if(outputFile.printf("%s%s%s\n", varNames.c_str(), separator, buffer) == false) {
                   outputFile.finish();
                   exit(1);
                }
             }
          }
          else {
-            if(outputFile.printf("%s %s\n", varValues.c_str(), buffer) == false) {
+            if(outputFile.printf("%s%s%s\n", varValues.c_str(), separator, buffer) == false) {
                outputFile.finish();
                exit(1);
             }
@@ -162,10 +165,12 @@ int main(int argc, char** argv)
    bool         quietMode        = false;
    bool         withLineNumbers  = false;
    unsigned int compressionLevel = 9;
+   const char*  separator        = "\t";
 
    // ====== Handle command-line arguments ==================================
    const static struct option long_options[] = {
       { "compress",                  required_argument, 0, 'c' },
+      { "separator",                 required_argument, 0, 's' },
       { "line-numbers",              no_argument,       0, 'n' },
       { "quiet",                     no_argument,       0, 'q' },
 
@@ -176,7 +181,7 @@ int main(int argc, char** argv)
 
    int option;
    int longIndex;
-   while( (option = getopt_long_only(argc, argv, "c:nqhv", long_options, &longIndex)) != -1 ) {
+   while( (option = getopt_long_only(argc, argv, "c:s:nqhv", long_options, &longIndex)) != -1 ) {
       switch(option) {
          case 'c':
             compressionLevel = atol(optarg);
@@ -187,6 +192,9 @@ int main(int argc, char** argv)
                compressionLevel = 9;
             }
           break;
+         case 's':
+            separator = optarg;
+          break;
          case 'n':
             withLineNumbers = true;
           break;
@@ -278,7 +286,8 @@ int main(int argc, char** argv)
             exit(1);
          }
          addDataFile(outputFile, withLineNumbers, outputLineNumber,
-                     varNames, varValues, std::string((const char*)&command[8]));
+                     varNames, varValues, std::string((const char*)&command[8]),
+                     separator);
          varValues = "";
       }
       else if(!(strncmp(command, "--varnames=", 11))) {