From 9b618dcc6d6ca4df5502461f700576f5d7ca5e53 Mon Sep 17 00:00:00 2001 From: Maciej Pasternacki Date: Thu, 18 Dec 2008 01:46:18 +0100 Subject: [PATCH] - Finish dropping TAXONOMY fn --- src/taxonomy.lisp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/taxonomy.lisp b/src/taxonomy.lisp index f6a98ac..ad870bc 100644 --- a/src/taxonomy.lisp +++ b/src/taxonomy.lisp @@ -310,7 +310,7 @@ optimization." (query (:insert-into 'item-term :set 'item-id (id item) 'term-id (id term) - 'item-term-value (encode-value (taxonomy term) value) + 'item-term-value (encode-value (term-taxonomy term) value) 'item-term-order (null-or order)))) (defun term-value (item term @@ -327,7 +327,7 @@ association with a NIL value and no association at all. Third value is a term ordering value, if ordering is set." (if encoded - (values (decode-value (taxonomy term) (first encoded)) t (unless-null (second encoded))) + (values (decode-value (term-taxonomy term) (first encoded)) t (unless-null (second encoded))) (values nil nil nil))) (defun (setf term-value) (new-value item term) @@ -336,7 +336,7 @@ Third value is a term ordering value, if ordering is set." New association between ITEM and TERM is established if it was not present before." (query (:select (:set-item-term-value (id item) (id term) - (encode-value (taxonomy term) new-value))) + (encode-value (term-taxonomy term) new-value))) :none)) (defun unbind-term (item term) @@ -403,9 +403,9 @@ terms of given taxonomy." (query (:select 'item-id :from 'item-term :where (:= 'term-id (id term))) :column)) -(defun term-items (term &aux (class (item-dao-class (taxonomy (if (integerp term) ; FIXME - (get-dao 'term term) - term)))) ) +(defun term-items (term &aux (class (item-dao-class (term-taxonomy (if (integerp term) ; FIXME + (get-dao 'term term) + term)))) ) "Items associated with given TERM." (mapcar #'(lambda (id) (get-dao class id)) -- 2.11.4.GIT