Changeset 29821 for main/trunk/greenstone2/perllib/classify/HFileHierarchy.pm

Timestamp:

2015-04-02T13:22:05+13:00 (9 years ago)

Author:

kjdon

Message:

Detecting and handling the case where a 0 has been entered into hierarchy numbering in an hfile.

File:

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

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

@@ -216 +216 @@
     foreach my $OID (sort keys (%$list)) {
     my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, "$classifier_num.$OID", $list->{$OID}->{'title'}, "VList");
-    
+    if (not defined ($tempinfo)) {
+        print STDERR "Error occurred for node $OID. Not creating the classifier \n";
+        return undef;
+    }
     if (defined $self->{'sort'}) {
         if ($self->{'reverse_sort'}) {
@@ -262 +265 @@
     return $classifyinfo;
     }
-
+    if ($headOID eq "0") {
+    print STDERR "Error: Hierarchy numbering must not contain 0\n";
+    return undef;
+    }
     $classifyinfo->{'contains'} = [] unless defined $classifyinfo->{'contains'};
     if ($self->{'documents_last'}) {