From 77c174f5c0f596b55d2d54d4ae5b8ffd8d84350d Mon Sep 17 00:00:00 2001 From: Charles Day Date: Sun, 22 Mar 2009 17:48:34 +0000 Subject: [PATCH] QIF: Replicate the fix from r17998 in two other QIF-related places. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17999 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/qif-io-core/qif-parse.scm | 2 +- src/import-export/qif/qif-parse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/import-export/qif-io-core/qif-parse.scm b/src/import-export/qif-io-core/qif-parse.scm index 99602e68c5..6603841893 100644 --- a/src/import-export/qif-io-core/qif-parse.scm +++ b/src/import-export/qif-io-core/qif-parse.scm @@ -19,7 +19,7 @@ (define qif-category-compiled-rexp - (make-regexp "^ *(\\[)?([^]/\\|]*)(]?)(/([^\\|]*))?(\\|(\\[)?([^]/]*)(]?)(/(.*))?)? *$")) + (make-regexp "^ *(\\[)?([^]/|]*)(]?)(/([^|]*))?(\\|(\\[)?([^]/]*)(]?)(/(.*))?)? *$")) (define qif-date-compiled-rexp (make-regexp "^ *([0-9]+) *[-/.'] *([0-9]+) *[-/.'] *([0-9]+).*$|^ *([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9]).*$")) diff --git a/src/import-export/qif/qif-parse.c b/src/import-export/qif/qif-parse.c index 5cd9b67f65..6cbf9d05de 100644 --- a/src/import-export/qif/qif-parse.c +++ b/src/import-export/qif/qif-parse.c @@ -79,7 +79,7 @@ static void compile_regex() { regcomp(&category_regex, - "^ *(\\[)?([^]/\\|]*)(]?)(/([^\\|]*))?(\\|(\\[)?([^]/]*)(]?)(/(.*))?)? *$", + "^ *(\\[)?([^]/|]*)(]?)(/([^|]*))?(\\|(\\[)?([^]/]*)(]?)(/(.*))?)? *$", REG_EXTENDED); qifp_regex_compiled = TRUE;