bug#36763: `guix search` does unexpected logical and

[zimoun <zimon.toutoune@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

Hi Ludo,

Thank you to look at it.

On Thu, 25 Jul 2019 at 19:35, Ludovic Courtès <ludo@gnu.org> wrote:

>   (fold p (make-list …) metrics)
>
> looks a lot like:
>
>   (map (lambda (x) (fold p x metrics)) regexps)
>
> Well, something like that.  :-)

Second try attached with your advice. :-)


I am not sure where to place the newlines on long line.
Then I will try to add tests and send it.


Thank you.


All the best,
simon

[-- Attachment #2: search.patch2 --]
[-- Type: application/octet-stream, Size: 2473 bytes --]

diff --git a/guix/ui.scm b/guix/ui.scm
index 7920335928..80b92bcc5f 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -1281,33 +1281,37 @@ weight of this field in the final score.
 
 A score of zero means that OBJ does not match any of REGEXPS.  The higher the
 score, the more relevant OBJ is to REGEXPS."
-  (define (score str)
-    (define scores
-      (map (lambda (regexp)
-             (fold-matches regexp str 0
-                           (lambda (m score)
-                             (+ score
-                                (if (string=? (match:substring m) str)
-                                    5             ;exact match
-                                    1)))))
-           regexps))
+  (define (score str regexp)
+    (fold-matches regexp str 0
+                  (lambda (m score)
+                    (+ score
+                       (if (string=? (match:substring m) str)
+                           5             ;exact match
+                           1)))))
+
+  (let ((scores (map
+                 (lambda (regexp)
+                   (fold
+                    (lambda (metric relevance)
+                      (match metric
+                        ((field . weight)
+                         (match (field obj)
+                           (#f  relevance)
+                           ((? string? str)
+                            (+ relevance (* (score str regexp) weight)))
+                           ((lst ...)
+                            (+ relevance (* weight
+                                            (apply + (map
+                                                      (lambda (str)
+                                                        (score str regexp))
+                                                      lst)))))))))
+                    0 metrics))
+                 regexps)))
 
     ;; Return zero if one of REGEXPS doesn't match.
     (if (any zero? scores)
         0
-        (reduce + 0 scores)))
-
-  (fold (lambda (metric relevance)
-          (match metric
-            ((field . weight)
-             (match (field obj)
-               (#f  relevance)
-               ((? string? str)
-                (+ relevance (* (score str) weight)))
-               ((lst ...)
-                (+ relevance (* weight (apply + (map score lst)))))))))
-        0
-        metrics))
+        (reduce + 0 scores))))
 
 (define %package-metrics
   ;; Metrics used to compute the "relevance score" of a package against a set