--- trunk/all2xml.pl	2004/02/08 20:16:54	224
+++ branches/hidra/all2xml.pl	2004/03/08 21:10:02	249
@@ -342,11 +342,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'?";
 						}
@@ -592,6 +602,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
@@ -728,8 +740,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 +796,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!";