Changeset 3486

Timestamp:

07/17/08 14:50:50 (4 months ago)

Author:

ksprotte

Message:

new macro do-countries and some bugfixes to contract-stats

Files:

• trunk/projects/bos/m2/m2.lisp (modified) (2 diffs)
• trunk/projects/bos/m2/packages.lisp (modified) (1 diff)

trunk/projects/bos/m2/m2.lisp

@@ -604 +604 @@
-         (sponsor (contract-sponsor contract))
-         (new-sponsor-p (alexandria:length= 1 (sponsor-contracts sponsor)))
-
+
+
-    (with-slots (sold-m2s paying-sponsors country-sponsors last-contracts)
-       
+        
-      ;; sold-m2s
-      (incf sold-m2s area)
-      ;; paying-sponsors
-      (when new-sponsor-p
-       
+        
-      ;; country-sponsors
-
-
-
-
-
-
+
+
+
+
+
+
+
-      ;; last-contracts
-      (setf last-contracts (nbutlast last-contracts))
@@ -641 +643 @@
-                   (object-destroyed-p contract)))
-             (contract-stats-last-contracts *contract-stats*)))
+
+(defun invoke-with-countries (function as-keyword)
+  (alexandria:maphash-keys
+   (if as-keyword
+       (lambda (country) (funcall function (make-keyword-from-string country)))
+       function)
+   (contract-stats-country-sponsors *contract-stats*)))
+
+(defmacro do-countries ((country &key as-keyword) &body body)
+  (check-type country symbol)
+  `(invoke-with-countries (lambda (,country) ,@body) ,as-keyword))
-
-(register-store-transient-init-function 'initialize-contract-stats)

trunk/projects/bos/m2/packages.lisp

@@ -171 +171 @@
-           #:contract-stats-for-country
-           #:last-paid-contracts
+           #:do-countries
-                           
-           #:make-m2-javascript