--- trunk/all2xml.pl	2004/03/07 22:51:14	234
+++ trunk/all2xml.pl	2004/03/09 12:17:05	255
@@ -211,8 +211,9 @@
 			# placeholder for all repeatable entries for index
 
 			sub chk_eval($) {
-				my $data = shift || return;
-				if ($data =~ s/eval{([^}]+)}//) {
+				my $data = shift;
+				return if (! defined($data));
+				if ($data && $data =~ s/\s*eval{([^}]+)}\s*//) {
 					if (eval "$1") {
 						return $data;
 					} else {
@@ -270,7 +271,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 +292,19 @@
 				}
 				# type="swish" ; field for swish
 				if ($swish) {
-					my $tmp;
 					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 {
-						$tmp = $swish;
+						$swish_data .= $swish if ($s);
+						$swish_exact_data .= "xxbxx $swish xxexx " if ($se && $swish ne "");
 					}
 
 					$tmp = chk_eval($tmp);
-					$swish_data .= $tmp if ($s);
+					$swish_data .= $tmp if ($s && $tmp);
 					$swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
 				}
 
@@ -334,7 +338,8 @@
 						no strict 'refs';
 						$idisplay = &$filter($idisplay);
 					}
-					push @index_data, $idisplay if (! $iterate_by_page);
+					$idisplay = chk_eval($idisplay);
+					push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
 				}
 
 				# store fields in lookup
@@ -741,8 +746,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!";
@@ -796,7 +802,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!";