--- trunk2/all2all.pl	2004/06/16 20:05:19	363
+++ trunk2/all2all.pl	2004/06/17 17:25:12	370
@@ -38,24 +38,13 @@
 
 while (my $rec = $webpac->fetch_rec) {
 
-	print "-- ",$webpac->parse($rec,'v250^a / [v562^4] v562^a'),"\n";
+	my @ds = $webpac->data_structure($rec);
 
-	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";
+	print $webpac->output(
+		template => 'text.tt',
+		data => \@ds,
+	) if (@ds);
 
-	my @t = $webpac->fill_in($rec,'v553^1;;v553^a');
-	print " Uži pojam: ",join("\t\n",@t),"\n" if (@t);
-
-	@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);
-
-	@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'});