From 5b3e5d9441948fe621c495a36556ec1011f65b41 Mon Sep 17 00:00:00 2001
From: Danjela Lura <danielaluraa@gmail.com>
Date: Fri, 7 Aug 2020 17:16:44 +0200
Subject: Update the package_metadata_tsvectors with new entries

Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 guix-data-service/model/utils.scm | 52 ++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

(limited to 'guix-data-service/model/utils.scm')

diff --git a/guix-data-service/model/utils.scm b/guix-data-service/model/utils.scm
index 79aa7da..e6c4a2b 100644
--- a/guix-data-service/model/utils.scm
+++ b/guix-data-service/model/utils.scm
@@ -365,28 +365,30 @@ WHERE table_name = $1"
                    (exec-query conn (insert-sql missing-entries)))))
          (new-entries-lookup-vhash
           (two-lists->vhash missing-entries
-                            new-entries)))
-
-    (if sets-of-data?
-        (map (lambda (field-value-lists)
-               ;; Normalise the result at this point, ensuring that the id's
-               ;; in the set are sorted
-               (sort
-                (map (lambda (field-values)
-                       (cdr
-                        (or (vhash-assoc (normalise-values field-values)
-                                         existing-entries)
-                            (vhash-assoc field-values
-                                         new-entries-lookup-vhash)
-                            (error "missing entry" field-values))))
-                     field-value-lists)
-                <))
-             data)
-        (map (lambda (field-values)
-               (cdr
-                (or (vhash-assoc (normalise-values field-values)
-                                 existing-entries)
-                    (vhash-assoc field-values
-                                 new-entries-lookup-vhash)
-                    (error "missing entry" field-values))))
-             data))))
+                            new-entries))
+         (all-ids
+          (if sets-of-data?
+              (map (lambda (field-value-lists)
+                     ;; Normalise the result at this point, ensuring that the id's
+                     ;; in the set are sorted
+                     (sort
+                      (map (lambda (field-values)
+                             (cdr
+                              (or (vhash-assoc (normalise-values field-values)
+                                               existing-entries)
+                                  (vhash-assoc field-values
+                                               new-entries-lookup-vhash)
+                                  (error "missing entry" field-values))))
+                           field-value-lists)
+                      <))
+                   data)
+              (map (lambda (field-values)
+                     (cdr
+                      (or (vhash-assoc (normalise-values field-values)
+                                       existing-entries)
+                          (vhash-assoc field-values
+                                       new-entries-lookup-vhash)
+                          (error "missing entry" field-values))))
+                   data))))
+    (values all-ids
+            new-entries)))
-- 
cgit v1.2.3