Changeset 29821 for main

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.

Location:

main/trunk/greenstone2/perllib

Files:

• classify.pm (modified) (1 diff)
• classify/HFileHierarchy.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/classify.pm

@@ -353 +353 @@
     {
     my $classifier_info = $classifier->get_classify_info($gli);
-    $classifier_info->{'classifyOID'} = "CL$next_classify_num" unless defined($classifier_info->{'classifyOID'});
-        print STDERR "*** outputting information for classifier: $classifier_info->{'classifyOID'}\n";
-
-    push(@{$classifyinfo->{'contains'}}, $classifier_info);
+    if (defined $classifier_info) {
+        $classifier_info->{'classifyOID'} = "CL$next_classify_num" unless defined($classifier_info->{'classifyOID'});
+        print STDERR "*** outputting information for classifier: $classifier_info->{'classifyOID'}\n";
+
+        push(@{$classifyinfo->{'contains'}}, $classifier_info);
+    } else {
+        print STDERR "*** error with classifier CL$next_classify_num, not outputing it\n";
+    }
     $next_classify_num++;
+
     }
 

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'}) {