[otrs-cvs] ITSMCore/Kernel/System Service.pm,1.39,1.40

Comments:
Update of /home/cvs/ITSMCore/Kernel/System
In directory lancelot:/tmp/cvs-serv25576/Kernel/System

Modified Files:
	Service.pm 
Log Message:
Updated files to latest framework version.

Author: ub

Index: Service.pm
===================================================================
RCS file: /home/cvs/ITSMCore/Kernel/System/Service.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -2 -u -d -r1.39 -r1.40
--- Service.pm	18 Jun 2013 14:29:28 -0000	1.39
+++ Service.pm	9 Jul 2013 17:29:42 -0000	1.40
@@ -150,5 +150,10 @@
 
     # read cache
-    my $CacheKey = 'ServiceList::' . $Param{Valid};
+    my $CacheKey = 'ServiceList::Valid::' . $Param{Valid};
+
+    if ( defined $Param{KeepChildren} && $Param{KeepChildren} eq '1' ) {
+        $CacheKey .= '::KeepChildren::' . $Param{KeepChildren};
+    }
+
     my $Cache = $Self->{CacheInternalObject}->Get( Key => $CacheKey );
     return %{$Cache} if ref $Cache eq 'HASH';
@@ -197,12 +202,14 @@
 
     # delete invalid services and childs
-    for my $ServiceID ( sort keys %ServiceList ) {
+    if ( !defined $Param{KeepChildren} || !$Param{KeepChildren} ) {
+        for my $ServiceID ( sort keys %ServiceList ) {
 
-        INVALIDNAME:
-        for my $InvalidName ( sort keys %ServiceInvalidList ) {
+            INVALIDNAME:
+            for my $InvalidName ( sort keys %ServiceInvalidList ) {
 
-            if ( $ServiceList{$ServiceID} =~ m{ \A \Q$InvalidName\E :: }xms ) {
-                delete $ServiceList{$ServiceID};
-                last INVALIDNAME;
+                if ( $ServiceList{$ServiceID} =~ m{ \A \Q$InvalidName\E :: }xms ) {
+                    delete $ServiceList{$ServiceID};
+                    last INVALIDNAME;
+                }
             }
         }
---------------------------------------------------------------------
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