Megatest

Diff
Login

Differences From Artifact [b49fc1c23e]:

To Artifact [c4333570bf]:


125
126
127
128
129
130
131
132
133
134
135
136
137










138
139
140
141
142
143
125
126
127
128
129
130
131






132
133
134
135
136
137
138
139
140
141

142
143
144
145
146







-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-





    (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 test-conf "items" '()))
	 (itemstable  (hash-table-ref/default test-conf "itemstable" '()))
	 (allitems    (if (or (not (null? items))(not (null? itemstable)))
			  (append (item-assoc->item-list items)
				  (item-table->item-list itemstable))
			  '(()))))
	 (items       (hash-table-ref/default tconfig "items" '()))
	 (itemstable  (hash-table-ref/default tconfig "itemstable" '())))
    (if (procedure? items)
	(set! items (items)))
    (if (procedure? itemstable)
	(set! itemstable (itemstable)))
    (if (or (not (null? items))(not (null? itemstable)))
	(append (item-assoc->item-list items)
		(item-table->item-list itemstable))
	'(()))))
    allitems))

;; (pp (item-assoc->item-list itemdat))