[otrs-cvs] otrs/Kernel/Modules AdminGenericInterfaceWebservice.pm, 1.39, 1.40 AdminGenericInterfaceMappingSimple.pm, 1.27, 1.28 AdminProcessManagement.pm, 1.44, 1.45 AdminGenericInterfaceWebserviceHistory.pm, 1.11, 1.12 AdminGenericInterfaceTransportHTTPSOAP.pm, 1.14, 1.15

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

Modified Files:
	AdminGenericInterfaceWebservice.pm 
	AdminGenericInterfaceMappingSimple.pm 
	AdminProcessManagement.pm 
	AdminGenericInterfaceWebserviceHistory.pm 
	AdminGenericInterfaceTransportHTTPSOAP.pm 
Log Message:
Fixed problems with YAML parsing long lines. Added new module dependency YAML::XS.

Author: mg

Index: AdminGenericInterfaceWebservice.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminGenericInterfaceWebservice.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -2 -u -d -r1.39 -r1.40
--- AdminGenericInterfaceWebservice.pm	9 Jan 2013 18:25:19 -0000	1.39
+++ AdminGenericInterfaceWebservice.pm	15 Jan 2013 17:43:26 -0000	1.40
@@ -21,5 +21,5 @@
 use Kernel::System::GenericInterface::Webservice;
 use Kernel::System::Valid;
-use YAML;
+use Kernel::System::YAML;
 
 sub new {
@@ -355,5 +355,5 @@
 
         # dump configuration into a YAML structure
-        my $YAMLContent = YAML::Dump( $WebserviceData->{Config} );
+        my $YAMLContent = Kernel::System::YAML::Dump( $WebserviceData->{Config} );
 
         # return yaml to download
@@ -498,5 +498,5 @@
         # if there is an error in YAML it returns a had error eval is needed to handle the error
         eval {
-            $ImportedConfig = YAML::Load( $ConfigFile{Content} );
+            $ImportedConfig = Kernel::System::YAML::Load( $ConfigFile{Content} );
         };
 

Author: mg

Index: AdminGenericInterfaceMappingSimple.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminGenericInterfaceMappingSimple.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -2 -u -d -r1.27 -r1.28
--- AdminGenericInterfaceMappingSimple.pm	20 Nov 2012 14:38:15 -0000	1.27
+++ AdminGenericInterfaceMappingSimple.pm	15 Jan 2013 17:43:26 -0000	1.28
@@ -1,5 +1,5 @@
 # --
 # Kernel/Modules/AdminGenericInterfaceMappingSimple.pm - provides a TransportHTTPSOAP view for admins
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -21,5 +21,4 @@
 use Kernel::System::GenericInterface::Webservice;
 use Kernel::System::Valid;
-use YAML;
 
 use Kernel::System::VariableCheck qw(:all);

Author: mg

Index: AdminProcessManagement.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminProcessManagement.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -2 -u -d -r1.44 -r1.45
--- AdminProcessManagement.pm	11 Jan 2013 16:29:22 -0000	1.44
+++ AdminProcessManagement.pm	15 Jan 2013 17:43:26 -0000	1.45
@@ -15,5 +15,5 @@
 use warnings;
 
-use YAML;
+use Kernel::System::YAML;
 
 use Kernel::System::JSON;
@@ -110,5 +110,5 @@
         );
 
-        my $ProcessData = YAML::Load( $UploadStuff{Content} );
+        my $ProcessData = Kernel::System::YAML::Load( $UploadStuff{Content} );
         if ( ref $ProcessData ne 'HASH' ) {
             return $Self->{LayoutObject}->ErrorScreen(
@@ -295,7 +295,9 @@
 
             # search and replace ocurrences of old ActivityDialog ids by the new ones
-            my $Config = YAML::Dump( $ProcessData->{Activities}->{$ActivityEntityID}->{Config} );
+            my $Config = Kernel::System::YAML::Dump(
+                $ProcessData->{Activities}->{$ActivityEntityID}->{Config}
+            );
             $Config =~ s{(AD\d+)}{$ActivityDialogMapping{$1}}xmsg;
-            $Config = YAML::Load($Config);
+            $Config = Kernel::System::YAML::Load($Config);
 
             my $ID = $Self->{ActivityObject}->ActivityAdd(
@@ -325,15 +327,15 @@
 
         # layout: search and replace ocurrences of old Activity ids by the new ones
-        my $Layout = YAML::Dump( $ProcessData->{Process}->{Layout} );
+        my $Layout = Kernel::System::YAML::Dump( $ProcessData->{Process}->{Layout} );
         $Layout =~ s{(\s+)(A\d+)}{$1$ActivityMapping{$2}}xmsg;
-        $Layout = YAML::Load($Layout);
+        $Layout = Kernel::System::YAML::Load($Layout);
 
         # config: search and replace ocurrences of old object ids by the new ones
-        my $Config = YAML::Dump( $ProcessData->{Process}->{Config} );
+        my $Config = Kernel::System::YAML::Dump( $ProcessData->{Process}->{Config} );
         $Config =~ s{(\s+)(A\d+)}{$1$ActivityMapping{$2}}xmsg;
         $Config =~ s{(\s+)(AD\d+)}{$1$ActivityDialogMapping{$2}}xmsg;
         $Config =~ s{(\s+)(T\d+)}{$1$TransitionMapping{$2}}xmsg;
         $Config =~ s{(\s+)(TA\d+)}{$1$TransitionActionMapping{$2}}xmsg;
-        $Config = YAML::Load($Config);
+        $Config = Kernel::System::YAML::Load($Config);
 
         # now add the process
@@ -517,5 +519,5 @@
 
         # convert the processdata hash to string
-        my $ProcessData = YAML::Dump( \%ProcessData );
+        my $ProcessData = Kernel::System::YAML::Dump( \%ProcessData );
 
         # send the result to the browser

Author: mg

Index: AdminGenericInterfaceWebserviceHistory.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminGenericInterfaceWebserviceHistory.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -2 -u -d -r1.11 -r1.12
--- AdminGenericInterfaceWebserviceHistory.pm	20 Nov 2012 14:38:59 -0000	1.11
+++ AdminGenericInterfaceWebserviceHistory.pm	15 Jan 2013 17:43:26 -0000	1.12
@@ -1,5 +1,5 @@
 # --
 # Kernel/Modules/AdminGenericInterfaceWebserviceHistory.pm - provides a log view for admins
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
 # --
 # $Id$
@@ -23,5 +23,5 @@
 use Kernel::System::VariableCheck qw(:all);
 
-use YAML;
+use Kernel::System::YAML;
 
 sub new {
@@ -196,5 +196,5 @@
 
     # dump config
-    $LogData->{Config} = YAML::Dump( $LogData->{Config} );
+    $LogData->{Config} = Kernel::System::YAML::Dump( $LogData->{Config} );
 
     # build JSON output
@@ -235,5 +235,5 @@
 
     # dump configuration into a YAML structure
-    my $YAMLContent = YAML::Dump( $WebserviceHistoryData->{Config} );
+    my $YAMLContent = Kernel::System::YAML::Dump( $WebserviceHistoryData->{Config} );
 
     # return yaml to download

Author: mg

Index: AdminGenericInterfaceTransportHTTPSOAP.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminGenericInterfaceTransportHTTPSOAP.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -2 -u -d -r1.14 -r1.15
--- AdminGenericInterfaceTransportHTTPSOAP.pm	11 Jan 2013 15:58:06 -0000	1.14
+++ AdminGenericInterfaceTransportHTTPSOAP.pm	15 Jan 2013 17:43:26 -0000	1.15
@@ -22,5 +22,4 @@
 use Kernel::System::Valid;
 use Kernel::System::JSON;
-use YAML;
 
 use Kernel::System::VariableCheck qw(:all);
---------------------------------------------------------------------
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