vndb/manned
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added search index table + simple XML-based search interface

Browse source 
The XML thing is supposed to be used for auto-completion, of course. The
current search implementation is very, very stupid and simple: Just a
prefix match on the man name, and simple detection of section stuff. I
suppose it'll suffice for now.
This commit is contained in:
Yorhel 2012-07-17 18:45:41 +02:00
parent 5d39a55158
commit 10e8d4acae
4 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
www/index.pl
View file

@ -42,7 +42,7 @@ TUWF::register(
qr{info/about} => \&about,
qr{browse/([^/]+)} => \&browsesys,
qr{browse/([^/]+)/([^/]+)(?:/([^/]+))?} => \&browsepkg,
qr{xml/search} => \&xmlsearch,
qr{xml/search\.xml} => \&xmlsearch,
qr{([^/]+)/([0-9a-f]{8})} => \&man,
qr{([^/]+)/([0-9a-f]{8})/src} => \&src,
qr{([^/]+)} => \&man,
@ -470,33 +470,15 @@ sub src {
}
# TODO: This is a prototype, really needs to be polished and optimized!
sub xmlsearch {
my $self = shift;
my $q = $self->reqGet('q')||'';
my $mansect = $1 if $q =~ s/^([0-9])\s+// || $q =~ s/\(([a-zA-Z0-9]+)\)$//;
my $manname = $1 if $q =~ s/^([a-zA-Z0-9,.:_-]+)$//;
# Manual pages
my $man = !$manname ? [] : $self->dbAll(
'SELECT name, section
FROM man !W
GROUP BY name, section
ORDER BY name, section
LIMIT 10',
{ # Don't use wildcards in this query, prevents index usage.
"name ILIKE '$manname%'" => 1,
$mansect ? ("section ILIKE '$mansect%'" => 1) : ()
}
);
my $man = $self->dbSearch($q, 20);
$self->resHeader('Content-Type' => 'text/xml; charset=UTF-8');
xml;
tag 'results';
tag 'mans';
tag 'man', %$_, undef for(@$man);
end;
tag 'man', %$_, undef for(@$man);
end 'results';
}
@ -602,6 +584,24 @@ sub dbManInfo {
}
# Very simple (and fast) prefix match.
sub dbSearch {
my($s, $q, $limit) = @_;
my $sect = $q =~ s/^([0-9])\s+// || $q =~ s/\(([a-zA-Z0-9]+)\)$// ? $1 : '';
my $name = $q =~ s/^([a-zA-Z0-9,.:_-]+)// ? $1 : '';
return !$name ? [] : $s->dbAll(
'SELECT name, section FROM man_index !W ORDER BY name, section LIMIT ?',
{ # Don't use wildcards in this query, prevents index usage.
"lower(name) LIKE '\L$name\E%'" => 1,
$sect ? ("section ILIKE '\L$sect\E%'" => 1) : ()
},
$limit
);
}
sub dbSystemGet {
return shift->dbAll('SELECT id, name, release, short, relorder FROM systems ORDER BY name, relorder');
}