From a18bf55baad800b5a0f84680f8a2e9c211d31926 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 27 Jun 2022 22:43:52 +0530 Subject: bin: Separate out search into (tissue search). * bin/tissue (tissue-search): Separate out search functionality into search-fold in (tissue search). * tissue/search.scm: New file. --- bin/tissue | 37 ++++-------------------------- tissue/search.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 32 deletions(-) create mode 100644 tissue/search.scm diff --git a/bin/tissue b/bin/tissue index 492bda7..aca0f89 100755 --- a/bin/tissue +++ b/bin/tissue @@ -40,6 +40,7 @@ exec guile --no-auto-compile -s "$0" "$@" (tissue document) (tissue git) (tissue issue) + (tissue search) (tissue tissue) (tissue utils) (tissue web static)) @@ -82,39 +83,11 @@ Search issues using SEARCH-QUERY. (args (call-with-database %xapian-index (lambda (db) - (let ((query (parse-query - ;; When query does not mention type or state, - ;; assume is:open. Assuming is:open is - ;; implicitly assuming type:issue since only - ;; issues can have is:open. - (if (every string-null? args) - "is:open" - (string-join (if (any (lambda (query-string) - (or (string-contains-ci query-string "type:") - (string-contains-ci query-string "is:"))) - args) - args - (cons "is:open" args)) - " AND ")) - #:stemmer (make-stem "en") - #:prefixes '(("type" . "XT") - ("title" . "S") - ("creator" . "A") - ("last-updater" . "XA") - ("updater" . "XA") - ("assigned" . "XI") - ("keyword" . "K") - ("tag" . "K") - ("is" . "XS"))))) - (format #t "total ~a~%" - (mset-fold (lambda (item count) - (print (call-with-input-string (document-data (mset-item-document item)) - (compose scm->object read)) - (MSetIterator-mset-get item)) + (format #t "total ~a~%" + (search-fold (lambda (document mset count) + (print document mset) (1+ count)) - 0 - (enquire-mset (enquire db query) - #:maximum-items (database-document-count db)))))))))) + 0 db args))))))) (define tissue-show (match-lambda* diff --git a/tissue/search.scm b/tissue/search.scm new file mode 100644 index 0000000..a257bbf --- /dev/null +++ b/tissue/search.scm @@ -0,0 +1,68 @@ +;;; tissue --- Text based issue tracker +;;; Copyright © 2022 Arun Isaac +;;; +;;; This file is part of tissue. +;;; +;;; tissue is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; tissue is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with tissue. If not, see . + +(define-module (tissue search) + #:use-module (srfi srfi-1) + #:use-module (tissue document) + #:use-module (tissue issue) + #:use-module (xapian wrap) + #:use-module (xapian xapian) + #:export (search-fold + search-map)) + +(define (search-fold proc initial db search-terms) + "Search xapian database DB using SEARCH-TERMS and fold over the +results using PROC and INITIAL. SEARCH-TERMS is a list of search terms +that are joined with the \"AND\" operator. + +PROC is invoked as (PROC DOCUMENT MSET PREVIOUS). DOCUMENT is an +instance of or one of its subclasses. MSET is the xapian +MSet object representing the search results. PREVIOUS is the return +from the previous invocation of PROC, or the given INITIAL for the +first call." + (let ((query (parse-query + ;; When query does not mention type or state, + ;; assume is:open. Assuming is:open is + ;; implicitly assuming type:issue since only + ;; issues can have is:open. + (if (every string-null? search-terms) + "is:open" + (string-join (if (any (lambda (query-string) + (or (string-contains-ci query-string "type:") + (string-contains-ci query-string "is:"))) + search-terms) + search-terms + (cons "is:open" search-terms)) + " AND ")) + #:stemmer (make-stem "en") + #:prefixes '(("type" . "XT") + ("title" . "S") + ("creator" . "A") + ("last-updater" . "XA") + ("assigned" . "XI") + ("keyword" . "K") + ("tag" . "K") + ("is" . "XS"))))) + (mset-fold (lambda (item result) + (proc (call-with-input-string (document-data (mset-item-document item)) + (compose scm->object read)) + (MSetIterator-mset-get item) + result)) + initial + (enquire-mset (enquire db query) + #:maximum-items (database-document-count db))))) -- cgit v1.2.3