--- trunk/all2xml.pl	2004/03/09 12:17:05	255
+++ trunk/all2xml.pl	2004/03/09 12:18:17	256
@@ -292,20 +292,15 @@
 				}
 				# 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 = join(" ",&$filter($swish)) if ($s || $se);
 					}
 
 					$tmp = chk_eval($tmp);
 					$swish_data .= $tmp if ($s && $tmp);
-					$swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
+					$swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
 				}
 
 				# type="display" ; field for display