Small QIF import patch

[Derek Atkins]

The following are some stylistic patches to the QIF import.
Nothing real substantial, but it saves a few function calls.

	* Remove an unused variable in qif-file.scm
	* Use a variable in qif-to-gnc instead of calling the same
          function over and over

-derek
	
Index: src/scm/qif-import/qif-file.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/scm/qif-import/qif-file.scm,v
retrieving revision 1.23
diff -u -r1.23 qif-file.scm
--- src/scm/qif-import/qif-file.scm	2001/02/14 22:08:15	1.23
+++ src/scm/qif-import/qif-file.scm	2001/03/01 21:30:17
@@ -35,11 +35,6 @@
           (start-time #f)
           (end-time #f)
           (delimiters (string #\cr #\nl))
-          (valid-acct-types 
-           '(type:bank type:cash
-                       type:ccard type:invst
-                       type:port
-                       #{type:oth\ a}#  #{type:oth\ l}#))
           (progress-dialog #f)
           (file-stats (stat path))
           (file-size (stat:size file-stats))
Index: src/scm/qif-import/qif-to-gnc.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/scm/qif-import/qif-to-gnc.scm,v
retrieving revision 1.42
diff -u -r1.42 qif-to-gnc.scm
--- src/scm/qif-import/qif-to-gnc.scm	2001/02/23 22:20:36	1.42
+++ src/scm/qif-import/qif-to-gnc.scm	2001/03/01 21:30:18
@@ -271,6 +271,14 @@
                  (ok-types (qif-map-entry:allowed-types acctinfo))
                  (equity? (memv GNC-EQUITY-TYPE ok-types)))
             
+	    ;; Debug
+	    ;; (for-each
+	    ;;  (lambda (expr)
+	    ;;    (display expr))
+	    ;;  (list "Account: " acctinfo "\nsecurity = " security 
+	    ;;	   "\nequity? = " equity? 
+	    ;;	   "\n"))
+
             (cond ((and equity? security)  ;; a "retained holdings" acct
                    (qif-import:find-or-make-acct acctinfo #f
                                                  security security
@@ -452,15 +460,12 @@
                     ;; in the acct-hash if it's an account.
                     ((and (not (string=? cat ""))
                           (qif-split:category-is-account? qif-split))
-                     (set! far-acct-info
-                           (hash-ref qif-acct-map 
-                                     (qif-split:category qif-split))))
+                     (set! far-acct-info (hash-ref qif-acct-map cat)))
                     
                     ;; .. look it up in the cat-hash if it's a category 
                     ((not (string=? cat ""))
-                     (set! far-acct-info
-                           (hash-ref qif-cat-map 
-                                     (qif-split:category qif-split))))
+                     (set! far-acct-info (hash-ref qif-cat-map cat)))
+
                     ;; otherwise, try to find the payee in the
                     ;; memo-map if it's likely to have been used (only
                     ;; 1 split).  then try the memo.  if neither
@@ -476,10 +481,8 @@
                                  (not (string=? qif-memo ""))
                                  (hash-ref qif-memo-map memo))))
                      (if (not far-acct-info)
-                         (set! far-acct-info
-                               (hash-ref 
-                                qif-cat-map 
-                                (qif-split:category qif-split))))))
+                         (set! far-acct-info (hash-ref qif-cat-map cat)))))
+
                    (set! far-acct-name (qif-map-entry:gnc-name far-acct-info))
                    (set! far-acct (hash-ref gnc-acct-hash far-acct-name))
                    

                    

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord@MIT.EDU                        PGP key available