--- trunk2/all2all.pl	2004/07/21 16:18:45	390
+++ trunk2/all2all.pl	2004/07/24 13:48:08	398
@@ -62,22 +62,21 @@
 		print OUT $webpac->output(
 			template => 'html.tt',
 			data => \@ds,
+			headline => $webpac->{'headline'},
 		);
 		close(OUT);
 	} else {
 		print $webpac->output(
 			template => 'text.tt',
 			data => \@ds,
+			headline => $webpac->{'headline'},
 		);
 	}
 
-	my $headline;
-	foreach my $ds (@ds) {
-		if ($ds->{'tag'} eq 'headline') {
-			$headline = join(" ",@{$ds->{'display'}});
-			last;
-		}
-	}
+	my $headline = $webpac->{'headline'};
+
+	my $f = $filename;
+	$f =~ s!out/!!;
 
 	# save into index
 	foreach my $ds (@ds) {
@@ -85,7 +84,7 @@
 
 		$index->insert(
 			index_name => $ds->{'tag'},
-			path => $filename,
+			path => $f,
 			headline => $headline,
 			words => join(" ",@{$ds->{'swish'}})
 		);