r15444 - gnucash/branches/2.0 - "string-match" uses regexp which can error out if a GNC Account has a

[Derek Atkins]

Author: warlord
Date: 2007-01-27 23:17:36 -0500 (Sat, 27 Jan 2007)
New Revision: 15444
Trac: http://svn.gnucash.org/trac/changeset/15444

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/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

Audited by andi5
Merge from r15414



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13975
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13983
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2007-01-28 04:09:55 UTC (rev 15443)
+++ gnucash/branches/2.0/ChangeLog	2007-01-28 04:17:36 UTC (rev 15444)
@@ -1,3 +1,11 @@
+2007-01-27  Derek Atkins  <derek at ihtfp.com>
+
+	* "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
+
 2007-01-27  Christian Stimming  <stimming at tuhh.de>
 
 	* Change Russian Ruble from RUR to RUB; r7574 was erroneous. #393185.

Modified: gnucash/branches/2.0/src/import-export/qif-import/qif-guess-map.scm
===================================================================
--- gnucash/branches/2.0/src/import-export/qif-import/qif-guess-map.scm	2007-01-28 04:09:55 UTC (rev 15443)
+++ gnucash/branches/2.0/src/import-export/qif-import/qif-guess-map.scm	2007-01-28 04:17:36 UTC (rev 15444)
@@ -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)
@@ -313,10 +315,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