Changeset 20102 for gsdl/trunk

Timestamp:

2009-07-29T13:32:12+12:00 (15 years ago)

Author:

kjdon

Message:

xiaofeng says that all the flax stuff here is old and not needed any more, so deleting it :-)

Location:

gsdl/trunk/perllib

Files:

• buildConfigxml.pm (modified) (4 diffs)
• collConfigxml.pm (modified) (3 diffs)

gsdl/trunk/perllib/buildConfigxml.pm

@@ -128 +128 @@
     # for subcollections
     my $filter = $_{'filter'};
-
-    # for flax activities
-    my $desid = $_{'desid'};
-    my $assigned = $_{'assigned'};
-    my $lang = $_{'lang'};
     
     #@ Marking repeated block
@@ -263 +258 @@
 
     }
-    #@ Handling each flaxActivity element (arrayarrayexp)
-    elsif ($element eq "flaxActivity") {
-        if (!defined $data->{'flaxActivity'}) {
-            $data->{'flaxActivity'} = [];
-        }
-        if(defined $assigned and $assigned =~ /\w/ and $assigned eq "true") {
-        if (defined $name and $name =~ /\w/) {
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'name');
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, $name);
-        }
-    
-        if (defined $desid and $desid =~ /\w/) {
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'desid');
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, $desid);
-        }       
-    
-        if (defined $lang and $lang =~ /\w/) {
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'lang');
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, $lang);
-        }       
-        }
-    }
 }
 
@@ -295 +268 @@
     }
     # $arrayarrayexp contains classifier|plugin
-    elsif($element =~ /$arrayarrayexp/ || $element eq "flaxActivity"){
+    elsif($element =~ /$arrayarrayexp/ ){
         $currentIndex = $currentIndex + 1;
     }
@@ -782 +755 @@
     }
 
-    my $flaxActivities = $collectcfg->{"flaxActivity"};
-    foreach my $fa (@$flaxActivities) {
-        # Six elements of the array for three attribute name/value pairs: name, desid, and lang.
-        if(defined $fa and @$fa[0] =~ /\w/ and @$fa[1] =~ /\w/ and @$fa[2] =~ /\w/ and @$fa[3] =~ /\w/  and @$fa[4] =~ /\w/ and @$fa[5] =~ /\w/) {
-            &write_line('COLCFG', ["<serviceRack type=\"flaxActivity\" ", @$fa[0], "=\"", @$fa[1], "\" ", @$fa[2], "=\"", @$fa[3], "\" ", @$fa[4], "=\"", @$fa[5], "\" />"]);
-        }
-    }  
     
     &write_line('COLCFG', ["</serviceRackList>"]);

gsdl/trunk/perllib/collConfigxml.pm

@@ -168 +168 @@
     # for subcollections
     my $filter = $_{'filter'};
-
-    # for flax activities
-    my $desid = $_{'desid'};
-    my $assigned = $_{'assigned'};
-    my $lang = $_{'lang'};
     
     #@ Marking repeated block
@@ -303 +298 @@
 
     }
-    #@ Handling each flaxActivity element (arrayarrayexp)
-    elsif ($element eq "flaxActivity") {
-        if (!defined $data->{'flaxActivity'}) {
-            $data->{'flaxActivity'} = [];
-        }
-        if(defined $assigned and $assigned =~ /\w/ and $assigned eq "true") {
-        if (defined $name and $name =~ /\w/) {
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'name');
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, $name);
-        }
-    
-        if (defined $desid and $desid =~ /\w/) {
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'desid');
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, $desid);
-        }       
-    
-        if (defined $lang and $lang =~ /\w/) {
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'lang');
-            push (@{$data->{'flaxActivity'}->[$currentIndex]}, $lang);
-        }       
-        }
-    }
+    
 }
 
@@ -335 +309 @@
     }
     # $arrayarrayexp contains classifier|plugin
-    elsif($element =~ /$arrayarrayexp/ || $element eq "flaxActivity"){
+    elsif($element =~ /$arrayarrayexp/ ){
         $currentIndex = $currentIndex + 1;
     }