add even more data to the main view, mainly most of the keyword lists

fixes a bug in the previous incarnation which would incorrectly record
one single key for lists (like CONFIGURE_STYLE)
simplify print-ports-INDEX accordingly
This commit is contained in:
espie
2018-12-01 08:28:55 +00:00
parent 0711273eea
commit fee2997fc1
3 changed files with 15 additions and 18 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.92 2018/11/30 22:26:04 espie Exp $
# $OpenBSD: Makefile,v 1.93 2018/12/01 08:28:55 espie Exp $
CATEGORIES = databases
V = 7.3
V = 7.4
DISTNAME = sqlports-$V
DISTFILES =
COMMENT = sqlite database of ports
+3 -2
View File
@@ -1,4 +1,4 @@
# $OpenBSD: Var.pm,v 1.40 2018/11/30 22:26:04 espie Exp $
# $OpenBSD: Var.pm,v 1.41 2018/12/01 08:28:55 espie Exp $
#
# Copyright (c) 2006-2010 Marc Espie <espie@openbsd.org>
#
@@ -373,6 +373,8 @@ sub subselect
package PkgPathsVar;
our @ISA = qw(AnyVar);
sub columntype() { 'OptCoalesceColumn' }
sub want_in_ports_view { 1 }
sub table() { 'PkgPaths' }
sub create_tables
@@ -607,7 +609,6 @@ sub subselect
package DefinedListKeyVar;
our @ISA = qw(ListKeyVar);
sub columntype() { 'OptValueColumn' }
sub add
{
@@ -1,5 +1,5 @@
#! /bin/sh
# $OpenBSD: print-ports-index,v 1.7 2018/11/30 22:26:04 espie Exp $
# $OpenBSD: print-ports-index,v 1.8 2018/12/01 08:28:55 espie Exp $
#
# Copyright (c) 2018 Marc Espie <espie@openbsd.org>
#
@@ -41,17 +41,15 @@ select fullpkgname,ports.fullpkgpath,
libd.dlist, buildd.dlist, rund.dlist,
(case 1 when ports.pathid in
-- thankful for for 2ndary tables, because onlyforarch has a weird value
-- when !defined, that cannot be tested for
(select fullpkgpath from _onlyforarch)
then onlyforarch_ordered.value
else (case 1 when ports.pathid in
(select fullpkgpath from _notforarch)
then "!"||notforarch_ordered.value
else "any"
end)
end),
case 1
when only_for_archs is null then
case 1
when not_for_archs is null
then 'any'
else '!'||not_for_archs
end
else only_for_archs
end,
(case lower(PERMIT_PACKAGE_CDROM) when "yes" then "y" else "n" end),
(case lower(PERMIT_PACKAGE_FTP) when "yes" then "y" else "n" end),
(case lower(PERMIT_DISTFILES_FTP) when "yes" then "y" else "n" end)
@@ -60,8 +58,6 @@ select fullpkgname,ports.fullpkgpath,
left join d2 as buildd on buildd.p=ports.pathid and buildd.t=2
left join d2 as rund on rund.p=ports.pathid and rund.t=1
join descr on descr.pathid=ports.pathid
left join onlyforarch_ordered on onlyforarch_ordered.fullpkgpath=ports.pathid
left join notforarch_ordered on notforarch_ordered.fullpkgpath=ports.pathid
where ports.pathid in (select distinct canonical from _paths)
order by ports.fullpkgpath;
EOSQL