AUDIT: r15414 - gnucash/trunk - "string-match" uses regexp which can error out if a GNC Account has a

[Derek Atkins]

Author: warlord
Date: 2007-01-21 19:04:45 -0500 (Sun, 21 Jan 2007)
New Revision: 15414
Trac: http://svn.gnucash.org/trac/changeset/15414

Modified:
   gnucash/trunk/
   gnucash/trunk/src/import-export/qif-import/qif-guess-map.scm
Log:
"string-match" uses regexp which can error out if a GNC Account has a
paren in it, or any other regexp special character.  Use
"string-contains" from srfi-13 instead.  Bug reported by Melinda Savoy:
http://lists.gnucash.org/pipermail/gnucash-user/2007-January/019028.html

BP



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1037
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13918
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1037
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13929
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/src/import-export/qif-import/qif-guess-map.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-guess-map.scm	2007-01-21 22:30:57 UTC (rev 15413)
+++ gnucash/trunk/src/import-export/qif-import/qif-guess-map.scm	2007-01-22 00:04:45 UTC (rev 15414)
@@ -5,6 +5,8 @@
 ;;;  Bill Gribble <grib at billgribble.com> 20 Feb 2000 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (srfi srfi-13))
+
 (define GNC-BANK-TYPE 0)
 (define GNC-CASH-TYPE 1)
 (define GNC-ASSET-TYPE 2)
@@ -315,10 +317,9 @@
    ;; this happens if you have the same tree but a different 
    ;; top-level structure. (i.e. expenses:tax vs. QIF tax)
    (and (> (string-length qif-acct-name) 0)
-        (string-match (string-downcase qif-acct-name) 
-                      (string-downcase (cadr gnc-acct))))))
+        (string-contains (string-downcase (cadr gnc-acct))
+			 (string-downcase qif-acct-name)))))
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  qif-import:find-new-acct
 ;;  Come up with a logical name for a new account based on