r15102 - gnucash/trunk - Fix three incorrect tests for swig-wrapped objects and one

[Andreas Köhler]

Author: andi5
Date: 2006-11-09 09:27:48 -0500 (Thu, 09 Nov 2006)
New Revision: 15102
Trac: http://svn.gnucash.org/trac/changeset/15102

Modified:
   gnucash/trunk/
   gnucash/trunk/src/business/business-reports/aging.scm
   gnucash/trunk/src/business/business-reports/invoice.scm
   gnucash/trunk/src/import-export/qif-import/qif-file.scm
   gnucash/trunk/src/report/report-system/report.scm
Log:
Fix three incorrect tests for swig-wrapped objects and one
initialization as #f instead of '(), the latter making qif imports work
again. Remove also a few lines of old commented cruft.



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:859
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13528
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:894
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13528
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/src/business/business-reports/aging.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/aging.scm	2006-11-09 14:13:46 UTC (rev 15101)
+++ gnucash/trunk/src/business/business-reports/aging.scm	2006-11-09 14:27:48 UTC (rev 15102)
@@ -183,8 +183,7 @@
 	   (temp-owner (gncOwnerCreate))
 	   (owner (gnc:owner-from-split split temp-owner)))
 
-      (if
-       owner
+      (if (not (null? owner))
        (let* ((guid (gncOwnerReturnGUID owner))
 	      (this-currency (xaccTransGetCurrency transaction))
 	      (this-date (gnc-transaction-get-date-posted transaction))

Modified: gnucash/trunk/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/invoice.scm	2006-11-09 14:13:46 UTC (rev 15101)
+++ gnucash/trunk/src/business/business-reports/invoice.scm	2006-11-09 14:27:48 UTC (rev 15102)
@@ -437,7 +437,7 @@
 		(add-subtotal-row table used-columns tax-collector
 				  "grand-total" (_ "Tax")))
 
-	    (if (and show-payments lot)
+	    (if (and show-payments (not (null? lot)))
 		(let ((splits (sort-list!
 			       (gnc-lot-get-split-list lot)
 			       (lambda (s1 s2)
@@ -488,7 +488,7 @@
 			     (gnc:gnc-monetary-amount (cdr entry-values)))
 
 	    (let ((order (gncEntryGetOrder current)))
-	      (if order (add-order order)))
+	      (if (not (null? order)) (add-order order)))
 
 	    (do-rows-with-subtotals rest
 				    table

Modified: gnucash/trunk/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-file.scm	2006-11-09 14:13:46 UTC (rev 15101)
+++ gnucash/trunk/src/import-export/qif-import/qif-file.scm	2006-11-09 14:27:48 UTC (rev 15102)
@@ -40,16 +40,13 @@
           (tag #f)
           (value #f)
           (heinous-error #f)
-          (start-time #f)
-          (end-time #f)
           (delimiters (string #\cr #\nl))
-          (progress-dialog #f)
+          (progress-dialog '())
           (file-stats (stat path))
           (file-size (stat:size file-stats))
           (bytes-read 0))
 
      (qif-file:set-path! self path)
-     (set! start-time (gettimeofday))
 
      (if (> file-size 10000)
          (begin

Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm	2006-11-09 14:13:46 UTC (rev 15101)
+++ gnucash/trunk/src/report/report-system/report.scm	2006-11-09 14:27:48 UTC (rev 15102)
@@ -434,19 +434,13 @@
 ;; marks the cursor busy during rendering; returns the html
 (define (gnc:report-run id)
   (let ((report (gnc-report-find id))
-	(start-time (gettimeofday))
 	(html #f))
     (gnc-set-busy-cursor '() #t)
     (gnc:backtrace-if-exception 
      (lambda ()
        (if report
 	   (begin 
-	     (set! html (gnc:report-render-html report #t))
-;;	     (display "total time to run report: ")
-;;	     (display (gnc:time-elapsed start-time (gettimeofday)))
-;;	     (newline)
-;;	     (display html) (newline)
-	     ))))
+	     (set! html (gnc:report-render-html report #t))))))
     (gnc-unset-busy-cursor '())
     html))