--- trunk/all2xml.pl	2003/12/15 00:12:16	196
+++ trunk/all2xml.pl	2004/01/07 12:29:11	199
@@ -282,23 +282,11 @@
 						no strict 'refs';
 						my $tmp = join(" ",&$filter($swish)) if ($s || $se);
 						$swish_data .= $tmp if ($s);
-						if ($se) {
-							if ($swish_exact_data) {
-								$swish_exact_data .= "xxexx xxbxx ".$tmp;
-							} else {
-								$swish_exact_data .= $tmp;
-							}
-						}
+						$swish_exact_data .= "xxbxx $tmp xxexx " if ($se && $tmp ne "");
 
 					} else {
 						$swish_data .= $swish if ($s);
-						if ($se) {
-							if ($swish_exact_data) {
-								$swish_exact_data .= "xxexx xxbxx ".$swish;
-							} else {
-								$swish_exact_data .= $swish;
-							}
-						}
+						$swish_exact_data .= "xxbxx $swish xxexx " if ($se && $swish ne "");
 					}
 				}
 
@@ -310,9 +298,9 @@
 					if ($filter) {
 						no strict 'refs';
 						if ($display_data) {
-							$display_data .= $delimiter.join($delimiter,mkformat($x,&$filter($display)));
+							$display_data .= $delimiter.mkformat($x,join($delimiter,&$filter($display)));
 						} else {
-							$display_data = join($delimiter,mkformat($x,&$filter($display)));
+							$display_data = mkformat($x,join($delimiter,&$filter($display)));
 						}
 					} else {
 						if ($display_data) {
@@ -494,7 +482,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};
@@ -536,7 +524,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));
 			}
 		}
 	}