Changeset 10630


Ignore:
Timestamp:
2005-09-23T15:22:59+12:00 (18 years ago)
Author:
kjdon
Message:

added -no_metadata_formatting option to avoid the format_metadata_for_sorting call

Location:
trunk/gsdl/perllib/classify
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/perllib/classify/AZCompactList.pm

    r10253 r10630  
    261261        }
    262262
    263         my $formatted_metavalue =
    264           sorttools::format_metadata_for_sorting($self->{'metadata'},
    265                              $metavalue, $doc_obj);
     263        my $formatted_metavalue;
     264        if ($self->{'no_metadata_formatting'}) {
     265            $formatted_metavalue = $metavalue;
     266        } else {
     267            $formatted_metavalue = &sorttools::format_metadata_for_sorting($self->{'metadata'},  $metavalue, $doc_obj);
     268        }
    266269       
    267270        #### prefix-str
    … …  
    438441        }
    439442
    440         $formatted_node = &sorttools::format_metadata_for_sorting($self->{'metadata'}, $formatted_node);
     443        $formatted_node = &sorttools::format_metadata_for_sorting($self->{'metadata'}, $formatted_node) unless $self->{'no_metadata_formatting'};
    441444
    442445        # In case our formatted string is empty...

  • trunk/gsdl/perllib/classify/AZList.pm

    r10253 r10630  
    160160    }
    161161   
    162     $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj);
     162   
     163    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
    163164   
    164165    if (defined $self->{'list'}->{$doc_OID}) {

  • trunk/gsdl/perllib/classify/AZSectionList.pm

    r10253 r10630  
    111111    }
    112112   
    113     $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj);
     113    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
    114114    if (defined $self->{'list'}->{"$doc_OID.$section"}) {
    115115        my $outhandle = $self->{'outhandle'};

  • trunk/gsdl/perllib/classify/BasClas.pm

    r10620 r10630  
    6666
    6767my $arguments =
    68     [ { 'name' => "builddir",
     68    [
     69      { 'name' => "no_metadata_formatting",
     70        'desc' => "{BasClas.no_metadata_formatting}",
     71        'type' => "flag" },
     72      { 'name' => "builddir",
    6973    'desc' => "{BasClas.builddir}",
    7074    'type' => "string",
    … …  
    7983    'type' => "int",
    8084    'deft' => "2",
    81     'reqd' => "no" },
     85    'reqd' => "no" }
     86     
    8287#      { 'name' => "ignore_namespace",
    8388#   'desc' => "{BasClas.ignore_namespace}",

  • trunk/gsdl/perllib/classify/DateList.pm

    r10253 r10630  
    122122    if (defined $self->{'sort'} && $self->{'sort'} ne "") {
    123123    $sort_other = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'sort'});
    124     $sort_other = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sort_other, $doc_obj);
     124    $sort_other = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sort_other, $doc_obj) unless $self->{'no_metadata_formatting'};
    125125    }
    126126    # if this document doesn't contain Date element we won't

  • trunk/gsdl/perllib/classify/Hierarchy.pm

    r10621 r10630  
    164164    } else {
    165165        $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
    166         if (defined $sortmeta) {
     166        if (defined $sortmeta && !$self->{'no_metadata_formatting'}) {
    167167        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
    168168        }

  • trunk/gsdl/perllib/classify/List.pm

    r10483 r10630  
    183183    } else {
    184184        $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
    185         if (defined $sortmeta) {
     185        if (defined $sortmeta && !$self->{'no_metadata_formatting'}) {
    186186        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
    187187        }
    … …  
    192192    # we add to the list based on metadata value
    193193    # but we need to do the same formatting as for sort value
    194     ($metavalue) = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj);
     194    ($metavalue) = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
    195195    $self->{'list'}->{$doc_OID} = $metavalue;
    196196    }

  • trunk/gsdl/perllib/classify/SectionList.pm

    r10253 r10630  
    8989    } else {
    9090        $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
    91         if (defined $sortmeta) {
     91        if (defined $sortmeta && !$self->{'no_metadata_formatting'}) {
    9292        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
    9393        }
    … …  
    147147    # sorting on the classification metadata
    148148    # do the same formatting on the meta value as for sort meta
    149     $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj);
     149    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
    150150    $self->{'list'}->{"$doc_OID.$section"} = $metavalue;
    151151    }
Note: See TracChangeset for help on using the changeset viewer.