X-Git-Url: http://git.rot13.org/?p=virtual-ldap;a=blobdiff_plain;f=bin%2Fcsv2yaml.pl;h=b2623f6e6fb83db8aa8a49af3ed19345a38ae409;hp=5193e1e0264bbef36ceb4ebcf9749dc962e1a408;hb=8166d09ec62b25bdd1f6f046d91b92470740309d;hpb=438c859977af8371ff6853ae4b5f51ef6965017c

diff --git a/bin/csv2yaml.pl b/bin/csv2yaml.pl
index 5193e1e..b2623f6 100755
--- a/bin/csv2yaml.pl
+++ b/bin/csv2yaml.pl
@@ -11,14 +11,14 @@ use Data::Dump qw/dump/;
 use File::Slurp;
 use YAML qw/DumpFile/;
 use Text::CSV;
-use Encode qw/decode/;
+use Encode qw/from_to/;
 
 my $debug = 0;
 
 my $path = shift @ARGV || die "usage: $0 file.csv\n";
 
 my $csv = read_file( $path );
-$csv = decode('utf-16', $csv);
+from_to($csv, 'utf-16', 'utf-8');
 
 my @columns;
 
@@ -47,7 +47,7 @@ foreach my $line ( split(/\r?\n/, $csv) ) {
 
 		# fix tel fields
 		$v =~ s{\s+}{#}g if $n =~ m{tel};
-		$v =~ s[\x{17d}][F] if $n =~ m{spol};
+		$v =~ s[\xC5\xBD][F]i if $n =~ m{spol};
 
 		if ( $v =~ m{#} ) { # subfields delimiter in CSV data
 			my @v = split(/\s*#+\s*/, $v);