Changeset 10663 for trunk/gsdl/perllib/classify/Hierarchy.pm

Timestamp:

2005-09-29T10:54:06+12:00 (19 years ago)

Author:

kjdon

Message:

added documents_last - display document nodes after classifier nodes in the lists

File:

• trunk/gsdl/perllib/classify/Hierarchy.pm (modified) (1 diff)

trunk/gsdl/perllib/classify/Hierarchy.pm

@@ -248 +248 @@
         
     }
-    # if this key has documents, add them
-    if (@doc_list) {
-        $has_content = 1;
-        foreach my $d (@doc_list) {
-        push (@{$entry->{'contains'}}, {'OID'=>$d});
-        }    
-    }
-    # if this key has nodes, add them
-    if (scalar(keys %{$top_hash->{$key}->{'nodes'}})) {
-        $has_content = 1;
-        $self->process_hash($top_hash->{$key}->{'nodes'}, $entry); 
-    }
+
+    if ($self->{'documents_last'}) {
+        # add nodes, then documents
+        # if this key has nodes, add them
+        if (scalar(keys %{$top_hash->{$key}->{'nodes'}})) {
+        $has_content = 1;
+        $self->process_hash($top_hash->{$key}->{'nodes'}, $entry); 
+        }
+
+        # if this key has documents, add them
+        if (@doc_list) {
+        $has_content = 1;
+        foreach my $d (@doc_list) {
+            push (@{$entry->{'contains'}}, {'OID'=>$d});
+        }    
+        }
+
+    } else {
+        # add documents then nodes
+        # if this key has documents, add them
+        if (@doc_list) {
+        $has_content = 1;
+        foreach my $d (@doc_list) {
+            push (@{$entry->{'contains'}}, {'OID'=>$d});
+        }    
+        }
+        # if this key has nodes, add them
+        if (scalar(keys %{$top_hash->{$key}->{'nodes'}})) {
+        $has_content = 1;
+        $self->process_hash($top_hash->{$key}->{'nodes'}, $entry); 
+        }
+    }
+    
     # if we have found some content, add the new entry for this key into the parent node
     if ($has_content) {