@@ -20,15 +20,27 @@ ;; (define itemdat '((ripeness "green ripe overripe") ;; (temperature "cool medium hot") ;; (season "summer winter fall spring"))) (declare (unit items)) -(declare (uses common)) +;; (declare (uses common)) (declare (uses debugprint)) (declare (uses commonmod)) -(import commonmod - debugprint) + +(module items +* + +(import scheme + chicken + commonmod + debugprint + + srfi-1 + srfi-69 + extras + data-structures + ) (include "common_records.scm") ;; Puts out all combinations (define (process-itemlist hierdepth curritemkey itemlist) @@ -120,17 +132,17 @@ '() #f))) res))) ;; Nope, not now, return null as of 6/6/2011 -(define (items:check-valid-items class item) - (let ((valid-values (let ((s (configf:lookup *configdat* "validvalues" class))) - (if s (string-split s) #f)))) +(define (items:check-valid-items valid-values class item) + ;; (let ((valid-values + (if valid-values (if (member item valid-values) item #f) - item))) + item)) ;; ) ;; '(("k1" "k2" "k3") ;; ("a" "b" "c") ;; ("d" "e" "f")) ;; @@ -209,8 +221,6 @@ (items:read-items-file sxmlf 'sxml) (items:read-items-file spacef 'space)) '(())))) ;; (pp (item-assoc->item-list itemdat)) - - - +)