--- trunk2/all2all.pl	2004/06/16 20:05:19	363
+++ trunk2/all2all.pl	2004/06/19 18:16:20	372
@@ -9,14 +9,18 @@
 use strict;
 use Data::Dumper;
 use Carp;
+use Log::Log4perl qw(get_logger :levels);
 
 use lib './lib';
 use WebPAC;
 
+Log::Log4perl->init('log.conf');
+my $log = get_logger();
+
 my $webpac = new WebPAC(
 	code_page => 'ISO-8859-2',
 	limit_mfn => 500,
-	debug => 1,
+#	debug => 1,
 ) || die;
 
 $|=1;
@@ -32,31 +36,27 @@
 	],
 );
 
-print "rows: $maxmfn\n\n";
+$log->info("rows: $maxmfn");
 
 $webpac->open_import_xml(type => 'isis_hidra_ths');
 
 while (my $rec = $webpac->fetch_rec) {
 
-	print "-- ",$webpac->parse($rec,'v250^a / [v562^4] v562^a'),"\n";
-
-	print " ",
-		$webpac->parse($rec,'eval{v901^a eq "Deskriptor"}v250^a / [v562^4] v562^a'),
-		$webpac->parse($rec,'eval{v901^a ne "Deskriptor"}250a [251]'),
-		"\n";
-
-	my @t = $webpac->fill_in($rec,'v553^1;;v553^a');
-	print " Uži pojam: ",join("\t\n",@t),"\n" if (@t);
+	my @ds = $webpac->data_structure($rec);
 
-	@t = $webpac->fill_in($rec,'eval{v901^a eq "Područje"}[a:v251::];;[d:[a:v251::]]');
-	print " Područje: ",join("\t\n",@t),"\n" if (@t);
+	if ($log->is_debug) {
+		$log->debug("rec = ",Dumper($rec));
+		$log->debug("ds = ",Dumper(\@ds));
+	}
+
+	print $webpac->output(
+		template => 'text.tt',
+		data => \@ds,
+	) if (@ds);
 
-	@t = $webpac->fill_in($rec,'eval{v901^a eq "Mikrotezaurus"}[a:v561^4:v251:];;[d:[a:v561^4:v251:]]');
-	print " Mikrotezaurus: ",join("\t\n",@t),"\n" if (@t);
-
-	@t = $webpac->fill_in($rec,'eval{v901^a eq "Deskriptor"}[a:v561^4:v562^4:v900];;[d:[a:v561^4:v562^4:v900]]');
-	print " Deskriptor: ",join("\t\n",@t),"\n" if (@t);
 }
 
-print "## lookup ",Dumper($webpac->{'lookup'});
-print "## data ",Dumper($webpac->{'data'});
+if ($log->is_debug) {
+	$log->debug("lookup hash: ",Dumper($webpac->{'lookup'}));
+	$log->debug("data hash: ",Dumper($webpac->{'data'}));
+}