r17999 - gnucash/trunk/src/import-export - QIF: Replicate the fix from r17998 in two other QIF-related places.

[Charles Day]

Author: cedayiv
Date: 2009-03-22 13:48:34 -0400 (Sun, 22 Mar 2009)
New Revision: 17999
Trac: http://svn.gnucash.org/trac/changeset/17999

Modified:
   gnucash/trunk/src/import-export/qif-io-core/qif-parse.scm
   gnucash/trunk/src/import-export/qif/qif-parse.c
Log:
QIF: Replicate the fix from r17998 in two other QIF-related places.


Modified: gnucash/trunk/src/import-export/qif/qif-parse.c
===================================================================
--- gnucash/trunk/src/import-export/qif/qif-parse.c	2009-03-22 17:24:58 UTC (rev 17998)
+++ gnucash/trunk/src/import-export/qif/qif-parse.c	2009-03-22 17:48:34 UTC (rev 17999)
@@ -79,7 +79,7 @@
 compile_regex()
 {
   regcomp(&category_regex,
-      "^ *(\\[)?([^]/\\|]*)(]?)(/([^\\|]*))?(\\|(\\[)?([^]/]*)(]?)(/(.*))?)? *$",
+      "^ *(\\[)?([^]/|]*)(]?)(/([^|]*))?(\\|(\\[)?([^]/]*)(]?)(/(.*))?)? *$",
           REG_EXTENDED);
 
   qifp_regex_compiled = TRUE;

Modified: gnucash/trunk/src/import-export/qif-io-core/qif-parse.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/qif-parse.scm	2009-03-22 17:24:58 UTC (rev 17998)
+++ gnucash/trunk/src/import-export/qif-io-core/qif-parse.scm	2009-03-22 17:48:34 UTC (rev 17999)
@@ -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]).*$"))