--- trunk/vhost/webpac2.cgi 2009/04/25 14:20:42 1162
+++ trunk/vhost/webpac2.cgi 2009/04/25 22:26:29 1173
@@ -22,7 +22,7 @@
sub dump_yaml {
my $name = shift;
- print qq|
# $name\n|, YAML::Dump( @_ ), qq|
| if $debug;
+ print qq|$name|, YAML::Dump( @_ ), qq|
| if $debug;
}
sub show_pager {
@@ -76,9 +76,13 @@
}
my $path = $ENV{PATH_INFO} || 'ecas';
+$path =~ s{^/+}{};
+$path =~ s{/+$}{};
my $dir = $0;
$dir =~ s{/[^/]+.cgi}{};
+dump_yaml( 'dir', $dir );
+
my $config = YAML::LoadFile( "$dir/$path/config.yml" );
my $database = (keys %{ $config->{databases} })[0];
@@ -93,11 +97,16 @@
undef $html_markup;
}
-my $estraier = YAML::LoadFile( "$dir/../var/estraier/$database.yaml" );
+my $stats;
+{
+ my $path = "$dir/../var/swish/$database.yaml";
+ $stats = YAML::LoadFile( $path );
+ dump_yaml( "stats $path", $stats );
+}
my $db = $config->{databases}->{$database};
-my @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup
+my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
# XXX pipe delimit list!
my $select_attr_operators = << '__ATTR_OPERATORS__';
@@ -128,10 +137,14 @@
warn "## only_input = ", dump( $only_input );
+my @style = ( '../../style.css' );
+push @style, "../../$path/$path.css" if -e "$dir/$path/$path.css";
+dump_yaml( 'style', \@style );
+
print
start_html(
-title => $db->{name},
- -style => '../../style.css',
+ -style => [ @style ],
),
h1( $db->{name} ),
qq||, $db->{description}, qq|
|,
@@ -145,7 +158,8 @@
popup_menu( -name => 'attr_operator', %$attr_operator ),
submit,
hidden( -name => 'entries_per_page', -default => $entries_per_page ),
- hidden( -name => 'current_page', -default => 1 ),
+ # we need current_page fixed at 1 so that every submit through form will reset it
+ qq||,
checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
qq|