Remove installer::existence::exists_in_array_of_hashes.

2 files changed, 9 insertions, 37 deletions

diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm
index 1f362f7a0aeb..0581efd9c5f7 100644
--- a/solenv/bin/modules/installer/existence.pm
+++ b/solenv/bin/modules/installer/existence.pm
@@ -49,26 +49,6 @@ sub exists_in_array
     return $alreadyexists;
 }
 
-sub exists_in_array_of_hashes
-{
-    my ($searchkey, $searchvalue, $arrayref) = @_;
-
-    my $valueexists = 0;
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $hashref = ${$arrayref}[$i];
-
-        if ( $hashref->{$searchkey} eq $searchvalue )
-        {
-            $valueexists = 1;
-            last;
-        }
-    }
-
-    return $valueexists;
-}
-
 #####################################################################
 # Returning a specified file as base for the new
 # configuration file, defined by its "gid"
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index cbd2cbdc7b39..2275cd10096e 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -29,7 +29,6 @@ package installer::setupscript;
 
 use base 'Exporter';
 
-use installer::existence;
 use installer::exiter;
 use installer::globals;
 use installer::logger qw(globallog);
@@ -393,23 +392,16 @@ sub add_predefined_folder
 {
     my ( $folderitemref, $folderref ) = @_;
 
-    for ( my $i = 0; $i <= $#{$folderitemref}; $i++ )
-    {
-        my $folderitem = ${$folderitemref}[$i];
-        my $folderid = $folderitem->{'FolderID'};
-
-        if ( $folderid =~ /PREDEFINED_/ )
-        {
-            if (! installer::existence::exists_in_array_of_hashes("gid", $folderid, $folderref))
-            {
-                my %folder = ();
-                $folder{'ismultilingual'} = "0";
-                $folder{'Name'} = "";
-                $folder{'gid'} = $folderid;
+    for my $folderid ( map { $_->{FolderID} } @{$folderitemref} ) {
+        # FIXME: Anchor to start of line?
+        next unless ( $folderid =~ /PREDEFINED_/ );
+        next if grep { $_->{gid} eq $folderid } @{$folderref};
 
-                push(@{$folderref}, \%folder);
-            }
-        }
+        push @{$folderref}, {
+            ismultilingual => 0,
+            Name => "",
+            gid => $folderid,
+        };
     }
 }