--- trunk/all2xml.pl	2003/07/04 16:56:40	58
+++ trunk/all2xml.pl	2003/07/04 17:57:11	59
@@ -66,6 +66,9 @@
 	my $type = shift @_;
 	my $row = shift @_;
 	my $add_xml = shift @_;
+	# needed to read values from configuration file
+	my $cfg = shift @_;
+	my $database = shift @_;
 
 	my $xml;
 
@@ -170,6 +173,24 @@
 			}
 		}
 
+		# now try to parse variables from configuration file
+		foreach my $x (@{$config->{indexer}->{$field}->{'config'}}) {
+
+			my $val = $cfg->val($database, x($x->{content}));
+
+			my ($s,$d,$i) = (1,1,0);	# swish, display default
+			$s = 0 if (lc($x->{type}) eq "display");
+			$d = 0 if (lc($x->{type}) eq "swish");
+			($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
+
+			if ($val) {
+				$display_data .= $val if ($d);
+				$swish_data .= $val if ($s);
+				$index->insert($field, $val, $path) if ($i);
+			}
+
+		}
+
 
 		if ($display_data) {
 
@@ -245,7 +266,7 @@
 	my $type_base = $type;
 	$type_base =~ s/_.+$//g;
 
-	$config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base} ], forcecontent => 1);
+	$config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config' ], forcecontent => 1);
 
 	# output current progress indicator
 	my $last_p = 0;
@@ -284,7 +305,7 @@
 
 				my $swishpath = $path."#".int($row->{mfn});
 
-				if (my $xml = data2xml($type_base,$row,$add_xml)) {
+				if (my $xml = data2xml($type_base,$row,$add_xml,$cfg,$database)) {
 					$xml = $cp2utf->convert($xml);
 					use bytes;	# as opposed to chars
 					print "Path-Name: $swishpath\n";
@@ -341,7 +362,7 @@
 
 			next if (! $row);
 
-			if (my $xml = data2xml($type,$row,$add_xml)) {
+			if (my $xml = data2xml($type_base,$row,$add_xml,$cfg,$database)) {
 				$xml = $cp2utf->convert($xml);
 				use bytes;	# as opposed to chars
 				print "Path-Name: $swishpath\n";