projects
/
webpac2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1777@llin: dpavlin | 2009-04-22 01:16:19 +0200
[webpac2]
/
vhost
/
webpac2.cgi
diff --git
a/vhost/webpac2.cgi
b/vhost/webpac2.cgi
index
3825fe2
..
f0f8215
100755
(executable)
--- a/
vhost/webpac2.cgi
+++ b/
vhost/webpac2.cgi
@@
-12,7
+12,8
@@
use Search::Estraier;
print header;
sub dump_yaml {
print header;
sub dump_yaml {
- print qq|<pre>|, YAML::Dump( @_ ), qq|</pre>|;
+ my $name = shift;
+ print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>|;
}
my $path = $ENV{PATH_INFO};
}
my $path = $ENV{PATH_INFO};
@@
-51,7
+52,7
@@
print end_form;
if ( my $search = param('search') ) {
if ( my $search = param('search') ) {
- print qq|<div id="results">
search: $search
|;
+ print qq|<div id="results">|;
my $node = Search::Estraier::Node->new(
url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
my $node = Search::Estraier::Node->new(
url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
@@
-64,9
+65,13
@@
if ( my $search = param('search') ) {
if ( ! $nres ) {
my $no_results = "No results for search '%s'";
if ( ! $nres ) {
my $no_results = "No results for search '%s'";
- printf qq|<div class="error">$no_results</
a
>|, $search;
+ printf qq|<div class="error">$no_results</
div
>|, $search;
} else {
} else {
- print qq|<ul>|;
+ my $results = "Got %d results for search '%s'";
+ printf qq|<div class="message">$results</div>|, $nres->hits, $search;
+
+ print qq|<ol>|;
+
foreach my $i ( 1 .. $nres->doc_num ) {
my $rdoc = $nres->get_doc( $i - 1 );
print qq|<li>|;
foreach my $i ( 1 .. $nres->doc_num ) {
my $rdoc = $nres->get_doc( $i - 1 );
print qq|<li>|;
@@
-74,12
+79,12
@@
if ( my $search = param('search') ) {
foreach @attr;
print qq|</li>\n|;
}
foreach @attr;
print qq|</li>\n|;
}
- print qq|</
u
l>|;
+ print qq|</
o
l>|;
}
print qq|</div>|;
}
}
print qq|</div>|;
}
-dump_yaml( $estraier );
-dump_yaml( $db );
+dump_yaml(
'estraier',
$estraier );
+dump_yaml(
'db',
$db );
print end_html;
print end_html;