[otrs-cvs] otrs/Kernel/System DynamicField.pm, 1.64, 1.65 YAML.pm, NONE, 1.1

Comments:
Update of /home/cvs/otrs/Kernel/System
In directory lancelot:/tmp/cvs-serv8521/Kernel/System

Modified Files:
	DynamicField.pm 
Added Files:
	YAML.pm 
Log Message:
Fixed problems with YAML parsing long lines. Added new module dependency YAML::XS.

Author: mg

Index: DynamicField.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/DynamicField.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -2 -u -d -r1.64 -r1.65
--- DynamicField.pm	2 Jan 2013 12:35:59 -0000	1.64
+++ DynamicField.pm	15 Jan 2013 17:43:26 -0000	1.65
@@ -15,5 +15,5 @@
 use warnings;
 
-use YAML;
+use Kernel::System::YAML;
 
 use Kernel::System::Cache;
@@ -185,5 +185,5 @@
 
     # dump config as string
-    my $Config = YAML::Dump( $Param{Config} );
+    my $Config = Kernel::System::YAML::Dump( $Param{Config} );
 
     # Make sure the resulting string has the UTF-8 flag. YAML only sets it if
@@ -305,5 +305,5 @@
     my %Data;
     while ( my @Data = $Self->{DBObject}->FetchrowArray() ) {
-        my $Config = YAML::Load( $Data[7] ) || {};
+        my $Config = Kernel::System::YAML::Load( $Data[7] ) || {};
 
         %Data = (
@@ -373,5 +373,5 @@
 
     # dump config as string
-    my $Config = YAML::Dump( $Param{Config} );
+    my $Config = Kernel::System::YAML::Dump( $Param{Config} );
 
     # Make sure the resulting string has the UTF-8 flag. YAML only sets it if

Author: mg

--- NEW FILE: YAML.pm ---
# --
# Kernel/System/YAML.pm - YAML wrapper
# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id: YAML.pm,v 1.1 2013/01/15 17:43:26 mg Exp $
# --
# This software comes with ABSOLUTELY NO WARRANTY. For details, see
# the enclosed file COPYING for license information (AGPL). If you
# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
# --

package Kernel::System::YAML;

use strict;
use warnings;

use YAML::Any qw();

use vars qw($VERSION);
$VERSION = qw($Revision: 1.1 $) [1];

=head1 NAME

Kernel::System::YAML - YAML wrapper functions

=head1 SYNOPSIS

Call this module directly without instantiating.

=over 4

=cut

sub Dump {
    my $Result = YAML::Any::Dump(@_);

    # Make sure the resulting string has the UTF-8 flag. YAML only sets it if
    #   part of the data already had it.
    utf8::upgrade($Result);

    return $Result;
}

sub Load {
    my $Result = eval {
        YAML::Any::Load(@_);
    };

    return $Result;
}

1;

=end Internal:

=back

=head1 TERMS AND CONDITIONS

This software is part of the OTRS project (L<http://otrs.org/>).

This software comes with ABSOLUTELY NO WARRANTY. For details, see
the enclosed file COPYING for license information (AGPL). If you
did not receive this file, see L<http://www.gnu.org/licenses/agpl.txt>.

=cut

=head1 VERSION

$Revision: 1.1 $ $Date: 2013/01/15 17:43:26 $

=cut
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log