|
|
@@ -237,20 +237,19 @@
|
|
|
(or (null filter)
|
|
|
(let ((words (split-sequence:split-sequence #\Space filter)))
|
|
|
(every #'(lambda (word)
|
|
|
- (declare (simple-string word))
|
|
|
(case category
|
|
|
- (album (or (search word (the simple-string (album-album data)) :test 'char-equal)
|
|
|
- (search word (the simple-string (album-artist data)) :test 'char-equal)
|
|
|
+ (album (or (search word (album-album data) :test 'char-equal)
|
|
|
+ (search word (album-artist data) :test 'char-equal)
|
|
|
(and (album-publisher data)
|
|
|
- (search word (the simple-string (album-publisher data)) :test 'char-equal))
|
|
|
+ (search word (album-publisher data) :test 'char-equal))
|
|
|
(and (album-country data)
|
|
|
- (search word (the simple-string (album-country data)) :test 'char-equal))))
|
|
|
+ (search word (album-country data) :test 'char-equal))))
|
|
|
(year (or (and (album-year data)
|
|
|
(search word (princ-to-string (the fixnum (album-year data))) :test 'char-equal))
|
|
|
(and (album-original-date data)
|
|
|
- (search word (the simple-string (album-original-date data)) :test 'char-equal))))
|
|
|
+ (search word (album-original-date data) :test 'char-equal))))
|
|
|
(t (and (slot-value data category)
|
|
|
- (search word (the simple-string (slot-value data category)) :test 'char-equal)))))
|
|
|
+ (search word (slot-value data category) :test 'char-equal)))))
|
|
|
words))))
|
|
|
|
|
|
(defun match-restrictions (data restrictions)
|
Innokentiy Enikeev