--- trunk/all2xml.pl	2004/02/08 20:16:54	224
+++ branches/tehnika/all2xml.pl	2004/03/14 19:44:57	286
@@ -151,6 +151,56 @@
 	}
 
 
+	# init variables for different types
+	sub init_visible_type($) {
+		my $type = shift;
+
+		# swish, swish_exact, display, index, index_lookup
+		# swish and display defaults
+		my ($s,$se,$d,$i,$il) = (1,0,1,0,0);
+		if (lc($type) eq "display") {
+			$s = 0;
+		} elsif (lc($type) eq "swish") {
+			$d = 0;
+		} elsif (lc($type) eq "index") {
+			($s,$se,$d,$i) = (0,1,0,1);
+		} elsif (lc($type) eq "swish_exact") {
+			($s,$se,$d,$i) = (0,1,0,0);
+		} elsif (lc($type) =~ /^lookup/) {
+			($s,$se,$d,$i,$il) = (0,1,0,0,1);
+		}
+		return ($s,$se,$d,$i,$il);
+	}
+
+
+	# convert
+	#
+	# <tag>
+	#  <delimiter>, </delimiter>
+	#  <value>200a</value>
+	# </tag>
+	# 
+	# to
+	#
+	# <tag delimiter=", ">200a</tag>
+	#
+	# but without loosing spaces in delimiter (becasue
+	# new XML::Simple strips spaces in attribute values
+	# as defined in XML specification)
+	#
+	sub unroll_x($) {
+		my $x = shift;
+
+		if (defined $x->{value}) {
+			my ($v,$d) = ($x->{value}->{content}, $x->{delimiter}->{content});
+			delete $x->{value};
+			delete $x->{delimiter};
+			$x->{content} = $v;
+			$x->{delimiter} = $d;
+		}
+		return $x;
+	}
+
 	# begin real work: go field by field
 	foreach my $field (@sorted_tags) {
 
@@ -184,19 +234,14 @@
 
 		foreach my $x (@{$config->{indexer}->{$field}->{$tag}}) {
 
+			$x = unroll_x($x);
+
 			my $format = x($x->{content});
 			my $delimiter = x($x->{delimiter}) || ' ';
 
 			my $repeat_off = 0;	# init repeatable offset
 
-			# swish, swish_exact, display, index, index_lookup
-			# swish and display defaults
-			my ($s,$se,$d,$i,$il) = (1,0,1,0,0);
-			$s = 0 if (lc($x->{type}) eq "display");
-			$d = 0 if (lc($x->{type}) eq "swish");
-			($s,$se,$d,$i) = (0,1,0,1) if (lc($x->{type}) eq "index");
-			($s,$se,$d,$i) = (0,1,0,0) if (lc($x->{type}) eq "swish_exact");
-			($s,$se,$d,$i,$il) = (0,1,0,0,1) if (lc($x->{type}) =~ /^lookup/);
+			my ($s,$se,$d,$i,$il) = init_visible_type($x->{type});
 
 			# what will separate last line from this one?
 			if ($display_data && $x->{append}) {
@@ -210,23 +255,10 @@
 
 			# placeholder for all repeatable entries for index
 
-			sub chk_eval($) {
-				my $data = shift;
-				if ($data =~ s/eval{([^}]+)}//) {
-					if (eval "$1") {
-						return $data;
-					} else {
-						return undef;
-					}
-				} else {
-					return $data;
-				}
-			}
-
 			sub mkformat($$) {
 				my $x = shift || die "mkformat needs tag reference";
 				my $data = shift || return;
-				my $format_name = x($x->{format_name}) || return chk_eval($data);
+				my $format_name = x($x->{format_name}) || return $data;
 				my $fmt = x($config->{format}->{$format_name}->{content}) || die "<format name=\"$format_name\"> is not defined!";
 				my $format_delimiter = x($x->{format_delimiter});
 				my @data;
@@ -239,10 +271,10 @@
 				if ($fmt) {
 					my $nr = scalar $fmt =~ s/%s/%s/g;
 					if (($#data+1) == $nr) {
-						return chk_eval(sprintf($fmt,@data));
+						return sprintf($fmt,@data);
 					} else {
 						#print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
-						return chk_eval($data);
+						return $data;
 					}
 				} else {
 					print STDERR "usage of link '$format_name' without defined format (<link> tag)\n";
@@ -270,7 +302,7 @@
 								$display = $new_display;
 								$cache->{lhash}->{$display} = $new_display;
 							} else {
-								print STDERR "WARNING: lookup for '$display' didn't find anything.\n";
+#								print STDERR "WARNING: lookup for '$display' didn't find anything.\n";
 								$display = "";
 								$cache->{lhash}->{$display} = $null;
 							}
@@ -291,16 +323,14 @@
 				}
 				# type="swish" ; field for swish
 				if ($swish) {
+					my $tmp = $swish;
 					if ($filter && ($s || $se)) {
 						no strict 'refs';
-						my $tmp = join(" ",&$filter($swish)) if ($s || $se);
-						$swish_data .= $tmp if ($s);
-						$swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
-
-					} else {
-						$swish_data .= $swish if ($s);
-						$swish_exact_data .= "xxbxx $swish xxexx " if ($se && $swish ne "");
+						$tmp = join(" ",&$filter($tmp)) if ($s || $se);
 					}
+
+					$swish_data .= $tmp if ($s && $tmp);
+					$swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
 				}
 
 				# type="display" ; field for display
@@ -333,7 +363,7 @@
 						no strict 'refs';
 						$idisplay = &$filter($idisplay);
 					}
-					push @index_data, $idisplay if (! $iterate_by_page);
+					push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
 				}
 
 				# store fields in lookup
@@ -342,11 +372,21 @@
 						if ($lookup_key) {
 							print STDERR "WARNING: try to redefine lookup_key (keys shouldn't be repeatable fields!)";
 						} else {
-							$lookup_key = $display;
+							if ($filter) {
+								no strict 'refs';
+								$lookup_key = &$filter($display);
+							} else {
+								$lookup_key = $display;
+							}
 						}
 					} elsif (lc($x->{type}) eq "lookup_val") {
 						if ($lookup_key) {
-							$lhash{$lookup_key} = $display;
+							if ($filter) {
+								no strict 'refs';
+								$lhash{$lookup_key} = &$filter($display);
+							} else {
+								$lhash{$lookup_key} = $display;
+							}
 						} else {
 							print STDERR "WARNING: no lookup_key defined for  '$display'?";
 						}
@@ -422,19 +462,17 @@
 		# now try to parse variables from configuration file
 		foreach my $x (@{$config->{indexer}->{$field}->{'config'}}) {
 
+			$x = unroll_x($x);
+
 			my $delimiter = x($x->{delimiter}) || ' ';
 			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");
-			# no support for swish exact in config.
-			# IMHO, it's useless
-			($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
+			# FIXME index_lookup is not supported!
+			my ($s,$se,$d,$i,$il) = init_visible_type($x->{type});
 
 			if ($val) {
 				$display_data .= $delimiter.$val if ($d);
-				$swish_data .= $val if ($s);
+				$swish_data .= " ".$val if ($s);
 				$index->insert($field, $val, $path) if ($i);
 			}
 
@@ -592,6 +630,8 @@
 		#tie %lhash, 'GDBM_File', $lookup_file, &GDBM_NEWDB, 0644;
 		tie %lhash, 'TDB_File', $lookup_file, TDB_CLEAR_IF_FIRST, O_RDWR, 0644;
 		print STDERR "creating lookup file '$lookup_file'\n";
+		# delete memory cache for lookup file
+		delete $cache->{lhash};
 	}
 
 	# open existing lookup file
@@ -608,7 +648,7 @@
 	my $type_base = $type;
 	$type_base =~ s/_.+$//g;
 
-	$config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config', 'format' ], forcecontent => 1);
+	$config=XMLin("./import_xml/$type.xml", ForceArray => [ $type2tag{$type_base}, 'config', 'format' ], ForceContent => 1 );
 
 	# output current progress indicator
 	my $last_p = 0;
@@ -728,8 +768,9 @@
 		print STDERR "\n";
 
 	} elsif ($type_base eq "excel") {
-		use Spreadsheet::ParseExcel;
-		use Spreadsheet::ParseExcel::Utility qw(int2col);
+		require Spreadsheet::ParseExcel;
+		require Spreadsheet::ParseExcel::Utility;
+		import Spreadsheet::ParseExcel::Utility qw(int2col);
 		
 		$import2cp = Text::Iconv->new($config->{excel_codepage},$codepage);
 		my $excel_file = $cfg -> val($database, 'excel_file') || die "$database doesn't have 'excel_file' defined!";
@@ -783,7 +824,7 @@
 		}
 	} elsif ($type_base eq "marc") {
 
-		use MARC;
+		require MARC;
 		
 		$import2cp = Text::Iconv->new($config->{marc_codepage},$codepage);
 		my $marc_file = $cfg -> val($database, 'marc_file') || die "$database doesn't have 'marc_file' defined!";