From 8ab3c1cc3c651d00090a4bfb94f7c64bda6fee1d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 29 Mar 2009 21:27:48 -0400
Subject: [PATCH] Bug Fix

- Fixed bug whereby if no columns labels were specified, it was
  considered a column count mismatch.
- Fixed unit tests to use m/d/Y not M/D/Y dateformat.
---
 src/report.cpp  | 7 ++++---
 src/tests/due.t | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/report.cpp b/src/report.cpp
index 44548560c..5d60baa81 100644
--- a/src/report.cpp
+++ b/src/report.cpp
@@ -2044,13 +2044,14 @@ std::string handleCustomReport (
   std::vector <std::string> labels;
   split (labels, labelList, ',');
 
-  if (columns.size () != labels.size ())
+  if (columns.size () != labels.size () && labels.size () != 0)
     throw std::string ("There are a different number of columns than labels ") +
           "for report '" + report + "'.  Please correct this.";
 
   std::map <std::string, std::string> columnLabels;
-  for (unsigned int i = 0; i < columns.size (); ++i)
-    columnLabels[columns[i]] = labels[i];
+  if (labels.size ())
+    for (unsigned int i = 0; i < columns.size (); ++i)
+      columnLabels[columns[i]] = labels[i];
 
   std::string sortList   = conf.get ("report." + report + ".sort");
   std::vector <std::string> sortOrder;
diff --git a/src/tests/due.t b/src/tests/due.t
index b320c9563..58ecc8a30 100755
--- a/src/tests/due.t
+++ b/src/tests/due.t
@@ -37,17 +37,18 @@ if (open my $fh, '>', 'due.rc')
             "due=4\n",
             "color=on\n",
             "color.due=red\n",
-            "_forcecolor=on\n";
+            "_forcecolor=on\n",
+            "dateformat=m/d/Y\n";
   close $fh;
   ok (-r 'due.rc', 'Created due.rc');
 }
 
 # Add a task that is almost due, and one that is just due.
 my ($d, $m, $y) = (localtime (time + 3 * 86_400))[3..5];
-my $just = sprintf ("%d/%02d/%d", $m + 1, $d, $y + 1900);
+my $just = sprintf ("%d/%d/%d", $m + 1, $d, $y + 1900);
 
 ($d, $m, $y) = (localtime (time + 5 * 86_400))[3..5];
-my $almost = sprintf ("%d/%02d/%d", $m + 1, $d, $y + 1900);
+my $almost = sprintf ("%d/%d/%d", $m + 1, $d, $y + 1900);
 
 qx{../task rc:due.rc add one due:$just};
 qx{../task rc:due.rc add two due:$almost};