r1834@llin: dpavlin | 2009-04-25 19:12:00 +0200

[webpac2] / vhost / webpac2.cgi

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 12ca195..79adc7d 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -93,11 +93,16 @@ if ( -e $html_markup ) {
        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 @@ print
 
 ;
 
-dump_yaml( 'inputs', $db->{input} );
-dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
-
 print  end_form;
 
 if ( my $search = param('search') ) {
@@ -235,6 +237,8 @@ if ( my $search = param('search') ) {
                while ( my $result = $swish_results->next_result ) {
                        my $data = from_json $result->property('data');
 
+                       dump_yaml( 'data', $data );
+
                        print qq|<li>|;
                        foreach my $attr ( @attr ) {
                                next unless defined $data->{$attr};
@@ -260,7 +264,7 @@ if ( my $search = param('search') ) {
 
 }
 
-dump_yaml( 'db', $db );
+dump_yaml( "config databases $database", $db );
 dump_yaml( 'html_markup_skip', $html_markup_skip );
 
 print  end_html;