Changeset 7406

Timestamp:

2004-05-25T10:05:28+12:00 (20 years ago)

Author:

davidb

Message:

Two changes made: the first to allow compact nodes to be formed ignoring
case sensitivity; the second allows for the metadata field to be a comma
separated list in the same way AZList allows.

File:

• trunk/gsdl/perllib/classify/AZCompactList.pm (modified) (13 diffs)

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -147 +147 @@
              q^maxcompact/.*/30^, \$maxcompact,
              q^doclevel/.*/top^, \$doclevel,
-             q^onlyfirst/.*/0^, \$onlyfirst,
+             q^onlyfirst^, \$onlyfirst,
              q^freqsort/.*/0^, \$freqsort,
              q^recopt/.*/-1^, \$recopt,  # Used in nested metadata such as -metadata Year/Organisation
@@ -169 +169 @@
     $self->{'list'} = {};
     $self->{'listmetavalue'} = {};
+    $self->{'list_mvpair'} = {};
     $self->{'reclassify'} = {};
     $self->{'reclassifylist'} = {};
@@ -214 +215 @@
     $self->{'list'} = {};
     $self->{'listmetavalue'} = {};
+    $self->{'list_mvpair'} = {};
     $self->{'reclassify'} = {};
     $self->{'reclassifylist'} = {};
@@ -234 +236 @@
 
     $metaname =~ s/(\/.*)//; # grab first name in n1/n2/n3 list
+    my @commameta_list = split(/,/, $metaname);
 
     if ($self->{'doclevel'} =~ /^top(level)?/i)
@@ -255 +258 @@
         = ($thissection ne "") ? "$doc_OID.$thissection" : $doc_OID;
 
-    if (defined $self->{'list'}->{$full_doc_OID}) 
+    if (defined $self->{'list_mvpair'}->{$full_doc_OID}) 
     {
         print $outhandle "WARNING: AZCompactList::classify called multiple times for $full_doc_OID\n";
@@ -261 +264 @@
     $self->{'list'}->{$full_doc_OID} = [];  
     $self->{'listmetavalue'}->{$full_doc_OID} = [];
-
-    my $metavalues = $doc_obj->get_metadata($thissection,$metaname);
+    $self->{'list_mvpair'}->{$full_doc_OID} = [];
+
+    my $metavalues = [];
+    foreach my $cmn (@commameta_list) {
+        my $cmvalues = $doc_obj->get_metadata($thissection,$cmn);
+        push(@$metavalues,@$cmvalues) if (defined $cmvalues);
+    }
+
     my $metavalue;
     foreach $metavalue (@$metavalues) 
@@ -301 +310 @@
             $formatted_metavalue="";
         }
+
+        my $mv_pair = { 'mv' => $metavalue, 'fmv' => $formatted_metavalue };
         push(@{$self->{'list'}->{$full_doc_OID}},$formatted_metavalue);
         push(@{$self->{'listmetavalue'}->{$full_doc_OID}} ,$metavalue);
+        push(@{$self->{'list_mvpair'}->{$full_doc_OID}},$mv_pair);
+
 
         last if ($self->{'onlyfirst'});
@@ -324 +337 @@
     map 
     { 
-    my $mv;
-    foreach $mv (@{$self->{'listmetavalue'}->{$_}} )
+    foreach my $mvp (@{$self->{'list_mvpair'}->{$_}} )
     {
-        $mtfreq{$mv}++; 
+###     print STDERR "*** plain mv = $mvp->{'mv'}\n";
+###     print STDERR "*** format mv = $mvp->{'fmv'}\n";
+
+        my $metavalue = $mvp->{'mv'};
+        $mtfreq{$metavalue}++; 
     }
     } @$classlist_ref;
@@ -336 +352 @@
     my $i = 1;
     my $metavalue;
-    foreach $metavalue (@{$self->{'listmetavalue'}->{$_}})
+    foreach my $mvp (@{$self->{'list_mvpair'}->{$_}})
     {
+        my $metavalue = $mvp->{'mv'};
+        my $cs_metavalue = $mvp->{'mv'}; # case sensative
         if ($mtfreq{$metavalue} >= $self->{'mingroup'})
         {
+###     print STDERR "*** pushing on $cs_metavalue\n";
+
         push(@multiple_classlist,[$_,$i,$metavalue]); 
         } 
         else
         {
-        push(@single_classlist,[$_,$metavalue]); 
+        push(@single_classlist,[$_,$cs_metavalue]); 
         $metavalue =~ tr/[A-Z]/[a-z]/;
         $self->{'reclassifylist'}->{"Metavalue_$i.$_"} = $metavalue;
@@ -437 +457 @@
             if (!$formatted_node) {next;}
         }
-        
+
         $formatted_node = $self->format_metadata_for_sorting($self->{'metaname'}, $formatted_node); 
 
@@ -470 +490 @@
     foreach $dm_pair (@$multiple_cl_ref) 
     {
-    my ($doc_OID,$mdoffset,$metavalue) = @$dm_pair;
+    my ($doc_OID,$mdoffset,$metavalue,$cs_metavalue) = @$dm_pair;
         my $listclassobj;
 
@@ -582 +602 @@
     my $self = shift (@_);
 
-    my @classlist =keys %{$self->{'list'}}; # list all doc oids
+    my @classlist =keys %{$self->{'list_mvpair'}}; # list all doc oids
 
     my ($single_cl_ref,$multiple_cl_ref) = $self->reinit(\@classlist);
@@ -684 +704 @@
     $title =~ s/^\W+//g; # remove leading non-word chars
 
-# only want first character for classification
+    # only want first character for classification
     $title =~ m/^(.)/;
     if ($1) {