Changeset 1123

Timestamp:

08/18/12 17:26:01 (12 years ago)

Author:

nanardon

Message:

Support an encoding parameter for Unix files base

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Unix.pm (modified) (5 diffs)
• man/man8/latmos-accounts-base-unix.pod (modified) (1 diff)
• man/man8/latmos-accounts-changes.pod (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix.pm

@@ -8 +8 @@
 use LATMOS::Accounts::Log;
 use Fcntl qw(:flock);
+use Encode;
 
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
@@ -76 +77 @@
 sub _load_unix_file {
     my ($self, $file, $callback) = @_;
+    my $enc = find_encoding($self->config('encoding') || 'iso-8859-14')
+        or do {
+        $self->log(LA_ERROR, "Cannot find encoding %s", $self->config('encoding') || 'iso-8859-15');
+        return;
+    };
     open(my $handle, '<', $file) or do {
         $self->log(LA_ERR, "Cannot open unix file `%s' for reading (%s)", $file, $!);
@@ -84 +90 @@
     while (my $line = <$handle>) {
         chomp($line);
+        $line = encode('utf-8', $line);
         my @ch = split(':', $line);
         $callback->(@ch);
@@ -195 +202 @@
 sub _save_unix_file {
     my ($self, $file, @data) = @_;
+    my $enc = find_encoding($self->config('encoding') || 'iso-8859-14')
+        or do {
+        $self->log(LA_ERROR, "Cannot find encoding %s", $self->config('encoding') || 'iso-8859-15');
+        return;
+    };
     open(my $handle, '>>', $file) or do {
         la_log(LA_ERR, "Cannot open unix file `%s' for writing (%s)", $file, $!);
@@ -202 +214 @@
     truncate($handle, 0);
     foreach my $line (@data) {
-        print $handle join(':', map { my $f = $_; $f =~ s/:/;/g; $f } map { defined($_) ? $_ : '' } @$line) . "\n";
+        my $string = join(':', map { my $f = $_; $f =~ s/:/;/g; $f } map { defined($_) ? $_ : '' } @$line) . "\n";
+        $string = decode('utf8', $string);
+        print $handle $string;
     }
     close($handle);

trunk/LATMOS-Accounts/man/man8/latmos-accounts-base-unix.pod

@@ -61 +61 @@
     group_1:500:x,dd,ee,ff
 
+=item encoding
+
+Specify the encoding of the file. Default is C<iso-8859-15>.
+
 =back

trunk/LATMOS-Accounts/man/man8/latmos-accounts-changes.pod

@@ -1 +1 @@
 =head1 3.0.1
 
+    - add support for various encoding for UNIX file
     - add description attribute to aliases and revaliases object
     - add user attributes to nethost to store poeple using the computer if it is