From 921bff74b889275112e0cfa64fcadad3aef46dac Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sat, 25 Apr 2009 17:11:33 +0000
Subject: [PATCH]  r1832@llin:  dpavlin | 2009-04-25 18:46:39 +0200  working on
 stats generation when indexing data

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1165 07558da8-63fa-0310-ba24-9fe276d99e06
---
 lib/WebPAC/Output/SWISH.pm |  3 +++
 vhost/webpac2.cgi          | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/WebPAC/Output/SWISH.pm b/lib/WebPAC/Output/SWISH.pm
index c252e42..759131f 100644
--- a/lib/WebPAC/Output/SWISH.pm
+++ b/lib/WebPAC/Output/SWISH.pm
@@ -130,6 +130,8 @@ my $escape_re  = join '|' => keys %escape;
 sub add {
 	my ($self,$id,$ds) = @_;
 
+	die "need input" unless $self->input;
+
 	my $log = $self->_get_logger;
 	$log->debug("id: $id ds = ",sub { dump($ds) });
 
@@ -168,6 +170,7 @@ sub add {
 		$xml .= qq{<$tag><![CDATA[BW $vals EW]]></$tag>};
 
 		$self->{stats}->{attr}->{$tag}++;
+		$self->{stats}->{input}->{ $self->input }->{$tag}++;
 
 		$data->{$tag} = $vals;
 	}
diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 12ca195..82c52a9 100755
--- 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') ) {
@@ -260,7 +262,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;
-- 
2.20.1