Changeset 29476

Show
Ignore:
Timestamp:
28.11.2014 17:09:12 (4 years ago)
Author:
sjs49
Message:

First of 2 commits to get diffcol on the 64 bit Ubuntu that has perl 5.18 to work again for the Multimedia and MARC-Singlefile collections. This commit does a sort keys once in both AZCompactList and MARCPlugin. Without the sort keys change to MARCPlugin, various entries of dc.Meta fields are stored in different orders each time. Without the sort keys change to AZCompactList, nodes with identical titles/names that differ only in capitalisation are sorted in a different order each time.

Location:
main/trunk/greenstone2/perllib
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/classify/AZCompactList.pm

    r28564 r29476  
    332332        my $metavalue = $mvp->{'mv'}; 
    333333        $metavalue =~ s!^-!\\-!; # in case it starts with "-" 
    334         my $cs_metavalue = $mvp->{'mv'}; # case sensative 
     334        my $cs_metavalue = $mvp->{'mv'}; # case sensitive 
    335335        if ($mtfreq{$metavalue} >= $self->{'mingroup'}) 
    336336        { 
     
    377377    $metaname = join('/',@metaname_list); 
    378378    } 
    379     foreach $metavalue (keys %mtfreq) 
     379    foreach $metavalue (sort keys %mtfreq) 
    380380    { 
    381381    if ($mtfreq{$metavalue} >= $mingroup) 
  • main/trunk/greenstone2/perllib/plugins/MARCPlugin.pm

    r28783 r29476  
    346346    my $metadata_mapping = $self->{'metadata_mapping'};; 
    347347 
    348     foreach my $marc_field ( keys %$metadata_mapping ) 
     348    foreach my $marc_field ( sort keys %$metadata_mapping ) 
    349349    { 
    350350    my $gsdl_field = $metadata_mapping->{$marc_field};