Changeset 23081

Timestamp:

2010-10-11T15:31:47+13:00 (14 years ago)

Author:

kjdon

Message:

added a classifyOID param to get_OID_entry. Used to set the classifyOID in the classifyinfo. This is needed to keep the hfile hierarchy numbering the same as what ends up in hte classifier. Otherwise, if do remove empty classifications, then the numbering gets mucked up, and memberof doesn't work, and the user can't assign categories to the documents.

File:

• main/trunk/greenstone2/perllib/classify/HFileHierarchy.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/classify/HFileHierarchy.pm

@@ -228 +228 @@
     my $list = $self->{'locatorlist'};
 
+    my $classifier_num = "CL".$self->get_number();
     # sorted the keys - otherwise funny things happen - kjdon 03/01/03
     foreach my $OID (sort keys (%$list)) {
-    my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, $list->{$OID}->{'title'}, "VList");
+    my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, "$classifier_num.$OID", $list->{$OID}->{'title'}, "VList");
     
     if (defined $self->{'sort'}) {
@@ -263 +264 @@
 sub get_OID_entry {
     my $self = shift (@_);
-    my ($OID, $classifyinfo, $title, $classifytype) = @_;
+    my ($OID, $classifyinfo, $classifyOID, $title, $classifytype) = @_;
 
     $OID = "" unless defined $OID;
@@ -273 +274 @@
     if (!defined $headOID) {
     $classifyinfo->{'Title'} = $title;
+    $classifyinfo->{'classifyOID'} = $classifyOID;
     $classifyinfo->{'classifytype'} = $classifytype;
     return $classifyinfo;
@@ -292 +294 @@
     }
 
-    return $self->get_OID_entry ($tailOID, $classifyinfo->{'contains'}->[($headOID-1)], $title, $classifytype);
+    return $self->get_OID_entry ($tailOID, $classifyinfo->{'contains'}->[($headOID-1)], $classifyOID, $title, $classifytype);
 
     }
@@ -306 +308 @@
     }
 
-    return $self->get_OID_entry ($tailOID, $classifyinfo->{'contains'}->[($headOID+$offset-1)], $title, $classifytype);
+    return $self->get_OID_entry ($tailOID, $classifyinfo->{'contains'}->[($headOID+$offset-1)], $classifyOID, $title, $classifytype);
 }