Changeset 20102


Ignore:
Timestamp:
07/29/09 13:32:12 (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/buildConfigxml.pm

    r20096 r20102  
    128128    # for subcollections
    129129    my $filter = $_{'filter'};
    130 
    131     # for flax activities
    132     my $desid = $_{'desid'};
    133     my $assigned = $_{'assigned'};
    134     my $lang = $_{'lang'};
    135130   
    136131    #@ Marking repeated block
     
    263258
    264259    }
    265     #@ Handling each flaxActivity element (arrayarrayexp)
    266     elsif ($element eq "flaxActivity") {
    267         if (!defined $data->{'flaxActivity'}) {
    268             $data->{'flaxActivity'} = [];
    269         }
    270         if(defined $assigned and $assigned =~ /\w/ and $assigned eq "true") {
    271         if (defined $name and $name =~ /\w/) {
    272             push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'name');
    273             push (@{$data->{'flaxActivity'}->[$currentIndex]}, $name);
    274         }
    275    
    276         if (defined $desid and $desid =~ /\w/) {
    277             push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'desid');
    278             push (@{$data->{'flaxActivity'}->[$currentIndex]}, $desid);
    279         }       
    280    
    281         if (defined $lang and $lang =~ /\w/) {
    282             push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'lang');
    283             push (@{$data->{'flaxActivity'}->[$currentIndex]}, $lang);
    284         }       
    285         }
    286     }
    287260}
    288261
     
    295268    }
    296269    # $arrayarrayexp contains classifier|plugin
    297     elsif($element =~ /$arrayarrayexp/ || $element eq "flaxActivity"){
     270    elsif($element =~ /$arrayarrayexp/ ){
    298271        $currentIndex = $currentIndex + 1;
    299272    }
     
    782755    }
    783756
    784     my $flaxActivities = $collectcfg->{"flaxActivity"};
    785     foreach my $fa (@$flaxActivities) {
    786         # Six elements of the array for three attribute name/value pairs: name, desid, and lang.
    787         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/) {
    788             &write_line('COLCFG', ["<serviceRack type=\"flaxActivity\" ", @$fa[0], "=\"", @$fa[1], "\" ", @$fa[2], "=\"", @$fa[3], "\" ", @$fa[4], "=\"", @$fa[5], "\" />"]);
    789         }
    790     } 
    791757   
    792758    &write_line('COLCFG', ["</serviceRackList>"]);
  • gsdl/trunk/perllib/collConfigxml.pm

    r20099 r20102  
    168168    # for subcollections
    169169    my $filter = $_{'filter'};
    170 
    171     # for flax activities
    172     my $desid = $_{'desid'};
    173     my $assigned = $_{'assigned'};
    174     my $lang = $_{'lang'};
    175170   
    176171    #@ Marking repeated block
     
    303298
    304299    }
    305     #@ Handling each flaxActivity element (arrayarrayexp)
    306     elsif ($element eq "flaxActivity") {
    307         if (!defined $data->{'flaxActivity'}) {
    308             $data->{'flaxActivity'} = [];
    309         }
    310         if(defined $assigned and $assigned =~ /\w/ and $assigned eq "true") {
    311         if (defined $name and $name =~ /\w/) {
    312             push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'name');
    313             push (@{$data->{'flaxActivity'}->[$currentIndex]}, $name);
    314         }
    315    
    316         if (defined $desid and $desid =~ /\w/) {
    317             push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'desid');
    318             push (@{$data->{'flaxActivity'}->[$currentIndex]}, $desid);
    319         }       
    320    
    321         if (defined $lang and $lang =~ /\w/) {
    322             push (@{$data->{'flaxActivity'}->[$currentIndex]}, 'lang');
    323             push (@{$data->{'flaxActivity'}->[$currentIndex]}, $lang);
    324         }       
    325         }
    326     }
     300   
    327301}
    328302
     
    335309    }
    336310    # $arrayarrayexp contains classifier|plugin
    337     elsif($element =~ /$arrayarrayexp/ || $element eq "flaxActivity"){
     311    elsif($element =~ /$arrayarrayexp/ ){
    338312        $currentIndex = $currentIndex + 1;
    339313    }
Note: See TracChangeset for help on using the changeset viewer.