From 07e36e695dab72d13dabb612ab22eb22bd397f2d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 8 Aug 2010 16:26:40 -0400 Subject: [PATCH] Bug - import - Fixed bug that only allowed import of *text* if there was more than one line of it. - Fixed some whacko formatting. --- src/import.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/import.cpp b/src/import.cpp index 1944c9507..535d8ecde 100644 --- a/src/import.cpp +++ b/src/import.cpp @@ -114,16 +114,16 @@ static fileType determineFileType (const std::vector & lines) // All done tasks begin with "x YYYY-MM-DD". if (lines[i].length () > 12) { - if ( lines[i][0] == 'x' && - lines[i][1] == ' ' && + if (lines[i][0] == 'x' && + lines[i][1] == ' ' && isdigit (lines[i][2]) && isdigit (lines[i][3]) && isdigit (lines[i][4]) && isdigit (lines[i][5]) && - lines[i][6] == '-' && + lines[i][6] == '-' && isdigit (lines[i][7]) && isdigit (lines[i][8]) && - lines[i][9] == '-' && + lines[i][9] == '-' && isdigit (lines[i][10]) && isdigit (lines[i][11])) return todo_sh_2_0; @@ -162,7 +162,7 @@ static fileType determineFileType (const std::vector & lines) return csv; // Looks like 'text' is the default case, if there is any data at all. - if (lines.size () > 1) + if (lines.size () >= 1) return text; return not_a_clue;