[bknr-cvs] ksprotte changed trunk/projects/bos/m2/p

[BKNR Commits]

Revision: 3485
Author: ksprotte
URL: http://bknr.net/trac/changeset/3485

make-poi-javascript now uses faster queries from contract-stats
U   trunk/projects/bos/m2/packages.lisp
U   trunk/projects/bos/m2/poi.lisp

Modified: trunk/projects/bos/m2/packages.lisp
===================================================================
--- trunk/projects/bos/m2/packages.lisp	2008-07-17 12:19:24 UTC (rev 3484)
+++ trunk/projects/bos/m2/packages.lisp	2008-07-17 12:22:38 UTC (rev 3485)
@@ -167,7 +167,7 @@
 	   #:contract-download-only-p
 	   ;; contract-stats
 	   #:number-of-sold-sqm
-	   #:paying-sponsors
+	   #:number-of-paying-sponsors
 	   #:contract-stats-for-country
 	   #:last-paid-contracts
 	   	   	   

Modified: trunk/projects/bos/m2/poi.lisp
===================================================================
--- trunk/projects/bos/m2/poi.lisp	2008-07-17 12:19:24 UTC (rev 3484)
+++ trunk/projects/bos/m2/poi.lisp	2008-07-17 12:22:38 UTC (rev 3485)
@@ -127,9 +127,8 @@
 (defun make-poi-javascript (language)
   "Erzeugt das POI-Javascript für das Infosystem"
   (with-output-to-string (*standard-output*)
-    (format t "var anzahlSponsoren = ~D;~%" (count-if (lambda (sponsor) (some #'contract-paidp (sponsor-contracts sponsor)))
-						      (class-instances 'sponsor)))
-    (format t "var anzahlVerkauft = ~D;~%" (bos.m2::number-of-sold-sqm))
+    (format t "var anzahlSponsoren = ~D;~%" (number-of-paying-sponsors))
+    (format t "var anzahlVerkauft = ~D;~%" (number-of-sold-sqm))
     (format t "var pois = new Array;~%")
     (dolist (poi (sort (remove-if #'(lambda (poi) (or (not (poi-complete poi language))
 						      (not (poi-published poi))))