X-Git-Url: http://git.rot13.org/?p=virtual-ldap;a=blobdiff_plain;f=bin%2Fcsv2yaml.pl;h=b2623f6e6fb83db8aa8a49af3ed19345a38ae409;hp=7faa9afefeda44c5d396db747f58622ec94ff96e;hb=f5dba74d799ed8249be1ed2bfe1d61cec9221bc2;hpb=4f4ef12009e8ec6d070f7473d2405ec0659229ba

diff --git a/bin/csv2yaml.pl b/bin/csv2yaml.pl
index 7faa9af..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,10 +47,10 @@ 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{#} ) {
-			my @v = split(/\s*#\s*/, $v);
+		if ( $v =~ m{#} ) { # subfields delimiter in CSV data
+			my @v = split(/\s*#+\s*/, $v);
 			foreach my $pos ( 0 .. $#v ) {
 				if ( $n =~ m{tel} ) {
 					if ( $v[$pos] =~ m{^09} ) {
@@ -61,8 +61,11 @@ foreach my $line ( split(/\r?\n/, $csv) ) {
 				}
 				$hash->{ $n . '_' . $pos } = $v[$pos];
 			}
+
+			$hash->{ $n } = [ @v ];
+		} else {
+			$hash->{ $n } = $v;
 		}
-		$hash->{ $n } = $v;
 	}
 
 	warn dump( $hash ) if $debug;