--- trunk/all2xml.pl	2003/12/14 20:50:03	195
+++ trunk/all2xml.pl	2004/03/11 18:23:59	259
@@ -210,10 +210,24 @@
 
 			# placeholder for all repeatable entries for index
 
+			sub chk_eval($) {
+				my $data = shift;
+				return if (! defined($data));
+				if ($data && $data =~ s/\s*eval{([^}]+)}\s*//) {
+					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 $data;
+				my $format_name = x($x->{format_name}) || return chk_eval($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;
@@ -226,10 +240,10 @@
 				if ($fmt) {
 					my $nr = scalar $fmt =~ s/%s/%s/g;
 					if (($#data+1) == $nr) {
-						return sprintf($fmt,@data);
+						return chk_eval(sprintf($fmt,@data));
 					} else {
-						print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
-						return $data;
+						#print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
+						return chk_eval($data);
 					}
 				} else {
 					print STDERR "usage of link '$format_name' without defined format (<link> tag)\n";
@@ -257,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;
 							}
@@ -278,36 +292,36 @@
 				}
 				# 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 .= $tmp if ($se);
-
-					} else {
-						$swish_data .= $swish if ($s);
-						$swish_exact_data .= $swish if ($se);
+						$tmp = join(" ",&$filter($tmp)) if ($s || $se);
 					}
+
+					$tmp = chk_eval($tmp);
+					$swish_data .= $tmp if ($s && $tmp);
+					$swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
 				}
 
 				# type="display" ; field for display
 				if ($d && $display) {
+					my $ldel = $delimiter;
 					if ($line_delimiter && $display_data) {
-						$display_data .= $line_delimiter;
+						$ldel = $line_delimiter;
 					}
 					if ($filter) {
 						no strict 'refs';
-						if ($display_data) {
-							$display_data .= $delimiter.join($delimiter,mkformat($x,&$filter($display)));
-						} else {
-							$display_data = join($delimiter,mkformat($x,&$filter($display)));
+						my @arr;
+						foreach my $tmp (&$filter($display)) {
+							my $tmp2 = mkformat($x,$tmp);
+							push @arr,$tmp2 if ($tmp2);
 						}
+						$display_data .= $ldel if ($display_data && @arr);
+						$display_data .= join($delimiter,@arr);
 					} else {
-						if ($display_data) {
-							$display_data .= $delimiter.mkformat($x,$display);
-						} else {
-							$display_data = mkformat($x,$display);
-						}
+						$display_data .= $ldel if ($display_data);
+						my $tmp = mkformat($x,$display);
+						$display_data .= $tmp if ($tmp);
 					}
 				}
 						
@@ -319,7 +333,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
@@ -328,11 +343,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'?";
 						}
@@ -451,7 +476,8 @@
 			for (my $page=0; $page <= $nr_pages; $page++) {
 				my $display_data;
 				if ($cache->{format}->{$field}) {
-					$display_data=mkformat($cache->{format}->{$field},$cache->{display_data}->{$field}->[$page]);
+					my $tmp = mkformat($cache->{format}->{$field},$cache->{display_data}->{$field}->[$page]);
+					$display_data=$tmp if ($tmp);
 				} else {
 					$display_data = $cache->{display_data}->{$field}->[$page];
 				}
@@ -482,7 +508,7 @@
 
 					# add delimiters before and after word.
 					# That is required to produce exact match
-					$xml .= xmlify($field."_swish_exact", unac_string($codepage,'xxbxx '.$swish_exact_data.' xxexx'));
+					$xml .= xmlify($field."_swish_exact", unac_string($codepage,$swish_exact_data));
 				}
 				
 				my $idel = $cache->{index_delimiter}->{$field};
@@ -524,7 +550,7 @@
 
 				# add delimiters before and after word.
 				# That is required to produce exact match
-				$xml .= xmlify($field."_swish_exact", unac_string($codepage,'xxbxx '.$swish_exact_data.' xxexx'));
+				$xml .= xmlify($field."_swish_exact", unac_string($codepage,$swish_exact_data));
 			}
 		}
 	}
@@ -577,6 +603,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
@@ -713,8 +741,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!";
@@ -768,29 +797,32 @@
 		}
 	} 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!";
 
 		# optional argument is format
-		my $format = x($config->{format}) || 'usmarc';
+		my $format = x($config->{marc_format}) || 'usmarc';
 
 		print STDERR "Reading MARC file '$marc_file'\n";
 
 		my $marc = new MARC;
 		my $nr = $marc->openmarc({
 				file=>$marc_file, format=>$format
-			}) || die "Can't open MARC file '$marc_file'";
+			}) || die "Can't open MARC file '$marc_file' with format '$format'";
+
+		# read MARC file in memory
+		$marc->nextmarc(-1);
 
-		my $i=0;	# record nr.
+		my $max_rec = $marc->marc_count();
 
-		my $rec;
+		for(my $i=1; $i<=$max_rec; $i++) {
 
-		while ($marc->nextmarc(1)) {
+			progress($i,$max_rec);
 
-			# XXX
-			fakeprogress($i++);
+			# store value for marc_sf.pm
+			$main::cache->{marc_record} = $i;
 
 			my $swishpath = $database."#".$i;
 
@@ -802,6 +834,9 @@
 				print "Document-Type: XML\n\n$xml\n";
 			}
 		}
+
+		print STDERR "\n";
+
 	} elsif ($type_base eq "feed") {
 
 		$import2cp = Text::Iconv->new($config->{feed_codepage},$codepage);