cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include locale in search-packages-in-revision

Browse source 
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Danjela Lura 2020-06-23 14:30:01 +02:00 • committed by Christopher Baines
parent f16fdb44f1
commit 89aaf984ec
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guix-data-service/model/package.scm
View file

@ -138,7 +138,9 @@ WHERE data.name IN (SELECT name FROM package_names);"))
(define* (search-packages-in-revision conn commit-hash (define* (search-packages-in-revision conn commit-hash
search-query search-query
#:key limit-results) #:key
limit-results
locale)
(define query (define query
(string-append (string-append
" "
@ -171,7 +173,7 @@ INNER JOIN (
INNER JOIN package_synopsis INNER JOIN package_synopsis
ON package_synopsis.id = ANY (package_synopsis_sets.synopsis_ids) ON package_synopsis.id = ANY (package_synopsis_sets.synopsis_ids)
ORDER BY package_synopsis_sets.id, ORDER BY package_synopsis_sets.id,
CASE WHEN package_synopsis.locale = $2 THEN 2 CASE WHEN package_synopsis.locale = $3 THEN 2
WHEN package_synopsis.locale = 'en_US.utf8' THEN 1 WHEN package_synopsis.locale = 'en_US.utf8' THEN 1
ELSE 0 ELSE 0
END DESC END DESC
@ -184,7 +186,7 @@ INNER JOIN (
INNER JOIN package_descriptions INNER JOIN package_descriptions
ON package_descriptions.id = ANY (package_description_sets.description_ids) ON package_descriptions.id = ANY (package_description_sets.description_ids)
ORDER BY package_description_sets.id, ORDER BY package_description_sets.id,
CASE WHEN package_descriptions.locale = $2 THEN 2 CASE WHEN package_descriptions.locale = $3 THEN 2
WHEN package_descriptions.locale = 'en_US.utf8' THEN 1 WHEN package_descriptions.locale = 'en_US.utf8' THEN 1
ELSE 0 ELSE 0
END DESC END DESC
@ -222,7 +224,7 @@ ORDER BY (
""))) "")))
(exec-query conn query (exec-query conn query
(list commit-hash search-query))) (list commit-hash search-query locale)))
(define (count-packages-in-revision conn commit-hash) (define (count-packages-in-revision conn commit-hash)
(define query (define query

3
guix-data-service/web/revision/controller.scm
View file

@ -575,7 +575,8 @@
conn conn
commit-hash commit-hash
search-query search-query
#:limit-results limit-results) #:limit-results limit-results
#:locale locale)
(select-packages-in-revision (select-packages-in-revision
conn conn
commit-hash commit-hash