@@ -117,10 +117,37 @@
 		  '()
 		  #f)))
       res)))
             ;; Nope, not now, return null as of 6/6/2011
 		
-  
+(define (check-valid-items class item)
+  (let ((valid-values (let ((s (config-lookup *configdat* "validvalues" class)))
+			(if s (string-split s) #f))))
+    (if valid-values
+	(if (member item valid-values)
+	    item #f)
+	item)))
+
+(define (items:get-items-from-config tconfig)
+  (let* (;; db is always at *toppath*/db/megatest.db
+	 (items       (hash-table-ref/default tconfig "items" '()))
+	 (itemstable  (hash-table-ref/default tconfig "itemstable" '())))
+    (debug:print 5 "items: " items " itemstable: " itemstable)
+    (set! items (map (lambda (item)
+		       (if (procedure? (cadr item))
+			   (list (car item)((cadr item)))
+			   item))
+		     items))
+    (set! itemstable (map (lambda (item)
+			    (if (procedure? (cadr item))
+				(list (car item)((cadr item)))
+				item))
+			  itemstable))
+    (if (or (not (null? items))(not (null? itemstable)))
+	(append (item-assoc->item-list items)
+		(item-table->item-list itemstable))
+	'(()))))
+
 ;; (pp (item-assoc->item-list itemdat))