Changeset 7835

Timestamp:

2004-08-02T15:41:33+12:00 (20 years ago)

Author:

jrm21

Message:

record mdoffset for each document when adding to a sub list. List.pm checks
for this offset in the document, and uses it if found.

Location:

trunk/gsdl/perllib/classify

Files:

• AZCompactList.pm (modified) (6 diffs)
• List.pm (modified) (2 diffs)

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -237 +237 @@
 $tmp = 0;
 
-sub classify 
+sub classify
 {
     my $self = shift (@_);
@@ -414 +414 @@
     if ($mtfreq{$metavalue} >= $self->{'mingroup'})
     {
+        # occurs more often than minimum required to compact into a group
         my $listclassobj;
         my $doclevel = $self->{'doclevel'};
@@ -518 +519 @@
         my ($doc_obj,$date) = @{$self->{'reclassify'}->{$doc_OID}};
 
+        # record the metadata value offset temporarily, so eg AZList can
+        # get the correct metadata value (for multi-valued metadata fields)
+        $doc_obj->{'mdoffset'}=$mdoffset;
+
         ## date appears to not be used in classifier call ####
 
@@ -723 +728 @@
 
     # only want first character for classification
-    $title =~ m/^(.)/;
+    $title =~ m/^(.)/; # always a char, or first byte of wide char?
     if (defined($1) && $1 ne "") {
         $title=$1;
@@ -753 +758 @@
     push (@tmparr, '0-9');
     }
-
     foreach $subclass (@tmparr) 
     {
@@ -767 +771 @@
         && defined $self->{'classifiers'}->{$1}) 
         {
+        # this is a "bookshelf" node... >1 entry compacted
                 push (@{$tempclassify->{'contains'}}, 
               $self->{'classifiers'}->{$1}->{'classifyinfo'});
+        # set the metadata field name, for mdoffset to work
+        $self->{'classifiers'}->{$1}->{'classifyinfo'}->{'mdtype'}=
+            $metaname;
         }
         else
         {
         $subsubOID =~ s/^Metavalue_(\d+)\.//;
+        # record the offset if this metadata type has multiple values
         my $metaname_offset = $1 -1;
         my $oid_rec = {'OID'=>$subsubOID, 'offset'=>$metaname_offset};

trunk/gsdl/perllib/classify/List.pm

@@ -153 +153 @@
     my $metaname;
     if (defined $self->{'meta_list'}) {
-    # find the first available metadata
-    foreach $m (@{$self->{'meta_list'}}) {
-        $metavalue = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $m);
-        $metaname = $m;
-        last if defined $metavalue;
+    my $topsection=$doc_obj->get_top_section();
+
+    # find the correct bit of metadata, if multi-valued metadata field
+    if (exists $doc_obj->{'mdoffset'}) { # set by AZCompactList
+        my $mdoffset=$doc_obj->{'mdoffset'} - 1;
+        # if this List is used by AZCompactList, then $metavalue is
+        # only really needed for sorting.
+        # assume (!!) there is only one fieldname in the meta_list
+        $metaname=(@{$self->{'meta_list'}})[0];
+        # get all metadata values for this field
+        my $values_listref=
+        $doc_obj->get_metadata($topsection, $metaname);
+        # get the correct one (from the offset)
+        $metavalue=@$values_listref[$mdoffset];
+        # use a special format for docOID...
+        $doc_OID .= ".offset$mdoffset";
+
+    } else {
+        # use the first available metadata
+        foreach my $m (@{$self->{'meta_list'}}) {
+        $metavalue = $doc_obj->
+            get_metadata_element($topsection, $m);
+        $metaname = $m;
+        last if defined $metavalue;
+        }
     } 
-    #if we haven't found a metavalue here, then the doc shouldn't be included
+    # if we haven't found a metavalue, then the doc shouldn't be included
     return unless defined $metavalue;
     }
@@ -213 +233 @@
 
     foreach $OID (@list) {
-    push (@{$classifyinfo{'contains'}}, {'OID'=>$OID});
+    my $hashref={};
+    # special oid format, if using offsets (from AZCompactList)
+    if ($OID =~ s/\.offset(\d+)$//) {
+        $hashref->{'offset'}=$1;
+    }
+    $hashref->{'OID'}=$OID;
+
+    push (@{$classifyinfo{'contains'}}, $hashref);
     }