--- branches/lezbib/all2xml.pl	2004/04/18 00:57:39	320
+++ branches/lezbib/all2xml.pl	2004/04/18 01:03:27	321
@@ -5,7 +5,6 @@
 use Getopt::Std;
 use Data::Dumper;
 use XML::Simple;
-use Text::Unaccent 1.02;	# 1.01 won't compile on my platform,
 use Text::Iconv;
 use Config::IniFiles;
 use Encode;
@@ -17,7 +16,7 @@
 
 my $config_file = $0;
 $config_file =~ s/\.pl$/.conf/;
-$config_file = $ARGV[0] if (-f $ARGV[0]);
+$config_file = $ARGV[0] if ($ARGV[0] && -f $ARGV[0]);
 die "FATAL: can't find configuration file '$config_file'" if (! -e $config_file);
 
 my $config;
@@ -526,7 +525,7 @@
 					$swish_data =~ s/ +/ /g;
 					$swish_data =~ s/ +$//g;
 
-					$xml .= xmlify($field."_swish", unac_string($codepage,$swish_data));
+					$xml .= xmlify($field."_swish", my_unac_string($codepage,$swish_data));
 				}
 
 				my $swish_exact_data = $cache->{swish_exact_data}->{$field}->[$page];
@@ -536,7 +535,7 @@
 
 					# add delimiters before and after word.
 					# That is required to produce exact match
-					$xml .= xmlify($field."_swish_exact", unac_string($codepage,$swish_exact_data));
+					$xml .= xmlify($field."_swish_exact", my_unac_string($codepage,$swish_exact_data));
 				}
 				
 				my $idel = $cache->{index_delimiter}->{$field};
@@ -569,7 +568,7 @@
 				$swish_data =~ s/ +/ /g;
 				$swish_data =~ s/ +$//g;
 
-				$xml .= xmlify($field."_swish", unac_string($codepage,$swish_data));
+				$xml .= xmlify($field."_swish", my_unac_string($codepage,$swish_data));
 			}
 
 			if ($swish_exact_data) {
@@ -578,7 +577,7 @@
 
 				# add delimiters before and after word.
 				# That is required to produce exact match
-				$xml .= xmlify($field."_swish_exact", unac_string($codepage,$swish_exact_data));
+				$xml .= xmlify($field."_swish_exact", my_unac_string($codepage,$swish_exact_data));
 			}
 		}
 	}
@@ -615,9 +614,18 @@
 
 my $show_progress = $cfg_global->val('global', 'show_progress');
 
-my $unac_filter = $cfg_global->val('global', 'unac_filter');
-if ($unac_filter) {
-	require $unac_filter;
+my $my_unac_filter = $cfg_global->val('global', 'my_unac_filter');
+if ($my_unac_filter) {
+	print STDERR "using $my_unac_filter to filter characters for search\n";
+	require $my_unac_filter;
+} else {
+	print STDERR "### fallback to default my_unac_string!\n";
+	eval q{
+	sub main::my_unac_string($$) {
+		my ($charset, $string) = (@_);
+		return $string;
+	}
+	};
 }
 
 foreach my $database ($cfg->Sections) {