From 72911a7caa984e9abb1fe090e8c84b2b33ac8a8b Mon Sep 17 00:00:00 2001 From: Mike Evans Date: Mon, 2 Jun 2014 17:13:32 +0100 Subject: [PATCH] Add some date format checking and make sure generated dates are the correct user selected format, not always locale format. --- .../bi_import/dialog-bi-import-helper.c | 18 ++++++++ .../bi_import/dialog-bi-import-helper.h | 1 + src/plugins/bi_import/dialog-bi-import.c | 44 ++++++++++++------- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/plugins/bi_import/dialog-bi-import-helper.c b/src/plugins/bi_import/dialog-bi-import-helper.c index cddd3530d8..9a0a48ca2c 100644 --- a/src/plugins/bi_import/dialog-bi-import-helper.c +++ b/src/plugins/bi_import/dialog-bi-import-helper.c @@ -24,6 +24,7 @@ #endif #include "dialog-bi-import-helper.h" +#include //! \brief helper function gboolean text2bool( const gchar *text ) @@ -43,6 +44,23 @@ gboolean text2bool( const gchar *text ) return erg; } + +//! \brief helper function +// Try to make a valid tm using the user set date format. Return false if it fails. +gboolean +isDateValid(char * date_string) +{ + char *tmp; + const gchar* date_format_string = qof_date_format_get_string (qof_date_format_get()); // Get the user set date format string + + struct tm time_struct; + memset(&time_struct, 0, sizeof(struct tm)); + + tmp = strptime(date_string, date_format_string, &time_struct); + if (tmp == NULL) return FALSE; + return TRUE; +} + //! \brief helper function GncAmountType text2disc_type( const gchar *text ) { diff --git a/src/plugins/bi_import/dialog-bi-import-helper.h b/src/plugins/bi_import/dialog-bi-import-helper.h index 8e7be3a816..402752b9a0 100644 --- a/src/plugins/bi_import/dialog-bi-import-helper.h +++ b/src/plugins/bi_import/dialog-bi-import-helper.h @@ -31,3 +31,4 @@ gboolean text2bool( const gchar *text ); GncAmountType text2disc_type( const gchar *text ); GncDiscountHow text2disc_how( const gchar *text ); +gboolean isDateValid(char * date_string); diff --git a/src/plugins/bi_import/dialog-bi-import.c b/src/plugins/bi_import/dialog-bi-import.c index a75c9f92f4..ad91f553ad 100644 --- a/src/plugins/bi_import/dialog-bi-import.c +++ b/src/plugins/bi_import/dialog-bi-import.c @@ -233,11 +233,16 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, { GtkTreeIter iter; gboolean valid, row_deleted, row_fixed; - gchar *id, *date_opened, *date_posted, *owner_id, *date, *quantity, *price; + gchar *id, *date_opened, *date_posted, *due_date, *owner_id, *date, *quantity, *price; GString *prev_id, *prev_date_opened, *prev_date_posted, *prev_owner_id, *prev_date; // needed to fix multi line invoices guint dummy; gint row = 1; + const gchar* date_format_string = qof_date_format_get_string (qof_date_format_get()); // Get the user set date format string + + + //date_format_string = qof_date_format_get_string (qof_date_format_get()); + DEBUG("date_format_string: %s",date_format_string); // allow the call to this function with only GtkListeStore* specified if (!fixed) fixed = &dummy; @@ -265,6 +270,7 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, ID, &id, DATE_OPENED, &date_opened, DATE_POSTED, &date_posted, + DUE_DATE, &due_date, OWNER_ID, &owner_id, DATE, &date, QUANTITY, &quantity, PRICE, &price, -1); @@ -279,6 +285,7 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, _("ROW %d DELETED, PRICE_NOT_SET: id=%s\n"), row, id); } + // TODO: QTY get set to 1 later if field is empty. Delete this section? else if (strlen (quantity) == 0) { // invalid row (no quantity given) @@ -324,7 +331,7 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, { // the row is valid (price and id are valid) - if (strlen (date_opened) == 0) + if(!isDateValid(date_opened)) { if (prev_date_opened->len == 0) { @@ -333,7 +340,7 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, GDate date; g_date_clear (&date, 1); gnc_gdate_set_today (&date); - g_date_strftime (temp, 20, "%x", &date); // create a locale specific date string + g_date_strftime (temp, 20, date_format_string, &date); // Create a user specified date string. g_string_assign (prev_date_opened, temp); } // fix this by using the previous date_opened value (multi line invoice) @@ -349,8 +356,8 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, // date_opened is valid - if (strlen (date_posted) == 0) - { + if(!isDateValid(date_posted)) + { if (prev_date_posted->len == 0) { // this invoice will have to get posted manually @@ -370,13 +377,25 @@ gnc_bi_import_fix_bis (GtkListStore * store, guint * fixed, guint * deleted, } // date_posted is valid - + /* + // Check if due date is valid. Set it to date_posted if not valid or missing. + if(!isDateValid(due_date)) + { + gtk_list_store_set (store, &iter, DUE_DATE, + date_posted, -1); + row_fixed = TRUE; + + } + + // due_date is valid + */ if (strlen (quantity) == 0) { // quantity is unset => set to 1 gtk_list_store_set (store, &iter, QUANTITY, "1", -1); row_fixed = TRUE; } + // quantity is valid @@ -566,12 +585,12 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book, invoice = gnc_search_bill_on_id (book, id); else if (g_ascii_strcasecmp (type, "INVOICE") == 0) invoice = gnc_search_invoice_on_id (book, id); - PINFO( "Existing %s ID: %s\n", type, gncInvoiceGetID(invoice)); + DEBUG( "Existing %s ID: %s\n", type, gncInvoiceGetID(invoice)); // If the search is empty then there is no existing invoice so make a new one if (invoice == NULL) { - PINFO( "Creating a new : %s\n", type ); + DEBUG( "Creating a new : %s\n", type ); // new invoice invoice = gncInvoiceCreate (book); /* Protect against thrashing the DB and trying to write the invoice @@ -756,14 +775,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book, text2bool (accumulatesplits), auto_pay); } - else - { - PERR("Date format invalid in invoice import CSV."); - // Also report to user in dialog. - g_string_append_printf (info, - _("Date format invalid in invoice import CSV.") - ); - } + } g_free (new_id);