[Slim-Checkins] r10185 - in /branches/6.5: platforms/redhat/slimserver.spec.build server/CPAN/DBIx/Class/UTF8Columns.pm server/scanner.pl server/slimserver.pl

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Oct  4 11:25:17 2006
New Revision: 10185

URL: http://svn.slimdevices.com?rev=10185&view=rev
Log:
Bug: N/A
Description: Merge from trunk -r 10182:10184

Modified:
    branches/6.5/platforms/redhat/slimserver.spec.build
    branches/6.5/server/CPAN/DBIx/Class/UTF8Columns.pm
    branches/6.5/server/scanner.pl
    branches/6.5/server/slimserver.pl

Modified: branches/6.5/platforms/redhat/slimserver.spec.build
URL: http://svn.slimdevices.com/branches/6.5/platforms/redhat/slimserver.spec.build?rev=10185&r1=10184&r2=10185&view=diff
==============================================================================
--- branches/6.5/platforms/redhat/slimserver.spec.build (original)
+++ branches/6.5/platforms/redhat/slimserver.spec.build Wed Oct  4 11:25:17 2006
@@ -5,7 +5,7 @@
 
 Name: slimserver 
 Packager: Slim Devices <support at slimdevices.com>
-Requires: perl >= 5.6
+Requires: perl >= 5.8.1
 Requires: perl-XML-Parser
 Requires: perl-Digest-SHA1
 AutoReqProv: no

Modified: branches/6.5/server/CPAN/DBIx/Class/UTF8Columns.pm
URL: http://svn.slimdevices.com/branches/6.5/server/CPAN/DBIx/Class/UTF8Columns.pm?rev=10185&r1=10184&r2=10185&view=diff
==============================================================================
--- branches/6.5/server/CPAN/DBIx/Class/UTF8Columns.pm (original)
+++ branches/6.5/server/CPAN/DBIx/Class/UTF8Columns.pm Wed Oct  4 11:25:17 2006
@@ -3,7 +3,16 @@
 use warnings;
 use base qw/DBIx::Class/;
 
-use utf8;
+BEGIN {
+
+    # Perl 5.8.0 doesn't have utf8::is_utf8()
+    # Yes, 5.8.0 support for Unicode is suboptimal, but things like RHEL3 ship with it.
+    if ($] <= 5.008000) {
+        require Encode;
+    } else {
+        require utf8;
+    }
+}
 
 __PACKAGE__->mk_classdata( '_utf8_columns' );
 
@@ -60,8 +69,13 @@
 
     my $cols = $self->_utf8_columns;
     if ( $cols and defined $value and $cols->{$column} ) {
-        utf8::decode($value) unless utf8::is_utf8($value);
-   }
+
+        if ($] <= 5.008000) {
+            Encode::_utf8_on($value) unless Encode::is_utf8($value);
+        } else {
+            utf8::decode($value) unless utf8::is_utf8($value);
+        }
+    }
 
     $value;
 }
@@ -75,7 +89,12 @@
     my %data = $self->next::method(@_);
 
     foreach my $col (grep { defined $data{$_} } keys %{ $self->_utf8_columns || {} }) {
-        utf8::decode($data{$col}) unless utf8::is_utf8($data{$col});
+
+        if ($] <= 5.008000) {
+            Encode::_utf8_on($data{$col}) unless Encode::is_utf8($data{$col});
+        } else {
+            utf8::decode($data{$col}) unless utf8::is_utf8($data{$col});
+        }
     }
 
     %data;
@@ -90,7 +109,12 @@
 
     my $cols = $self->_utf8_columns;
     if ( $cols and defined $value and $cols->{$column} ) {
-        utf8::encode($value) if utf8::is_utf8($value);
+
+        if ($] <= 5.008000) {
+            Encode::_utf8_off($value) if Encode::is_utf8($value);
+        } else {
+            utf8::encode($value) if utf8::is_utf8($value);
+        }
     }
 
     $self->next::method( $column, $value );

Modified: branches/6.5/server/scanner.pl
URL: http://svn.slimdevices.com/branches/6.5/server/scanner.pl?rev=10185&r1=10184&r2=10185&view=diff
==============================================================================
--- branches/6.5/server/scanner.pl (original)
+++ branches/6.5/server/scanner.pl Wed Oct  4 11:25:17 2006
@@ -11,6 +11,7 @@
 # GNU General Public License for more details.
 #
 
+require 5.008_001;
 use strict;
 use warnings;
 

Modified: branches/6.5/server/slimserver.pl
URL: http://svn.slimdevices.com/branches/6.5/server/slimserver.pl?rev=10185&r1=10184&r2=10185&view=diff
==============================================================================
--- branches/6.5/server/slimserver.pl (original)
+++ branches/6.5/server/slimserver.pl Wed Oct  4 11:25:17 2006
@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 #
 
-require 5.006_000;
+require 5.008_001;
 use strict;
 use warnings;