--- trunk/vhost/webpac2.cgi 2009/04/25 14:46:42 1164 +++ trunk/vhost/webpac2.cgi 2009/04/25 17:11:33 1165 @@ -93,11 +93,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__'; @@ -158,9 +163,6 @@ ; -dump_yaml( 'inputs', $db->{input} ); -dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } ); - print end_form; if ( my $search = param('search') ) { @@ -260,7 +262,7 @@ } -dump_yaml( 'db', $db ); +dump_yaml( "config databases $database", $db ); dump_yaml( 'html_markup_skip', $html_markup_skip ); print end_html;