--- trunk/all2xml.pl	2004/03/05 23:33:19	233
+++ trunk/all2xml.pl	2004/03/07 22:51:14	234
@@ -211,7 +211,7 @@
 			# placeholder for all repeatable entries for index
 
 			sub chk_eval($) {
-				my $data = shift;
+				my $data = shift || return;
 				if ($data =~ s/eval{([^}]+)}//) {
 					if (eval "$1") {
 						return $data;
@@ -291,16 +291,17 @@
 				}
 				# 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 {
-						$swish_data .= $swish if ($s);
-						$swish_exact_data .= "xxbxx $swish xxexx " if ($se && $swish ne "");
+						$tmp = $swish;
 					}
+
+					$tmp = chk_eval($tmp);
+					$swish_data .= $tmp if ($s);
+					$swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
 				}
 
 				# type="display" ; field for display