Changeset 10663

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

Location:

trunk/gsdl/perllib/classify

Files:

• HFileHierarchy.pm (modified) (2 diffs)
• Hierarchy.pm (modified) (1 diff)

trunk/gsdl/perllib/classify/HFileHierarchy.pm

@@ -74 +74 @@
     'desc' => "{Hierarchy.hlist_at_top}",
     'type' => "flag",
-    'reqd' => "no" } ];
+    'reqd' => "no" },
+      { 'name' => "documents_last",
+    'desc' => "{Hierarchy.documents_last}",
+    'type' => "flag",
+    'reqd' => "no"}
+      ];
 
 my $options = 
@@ -273 +278 @@
 
     $classifyinfo->{'contains'} = [] unless defined $classifyinfo->{'contains'};
+    if ($self->{'documents_last'}) {
+    # documents should come after nodes in the classifier
+
+    my $doc_pos = 0;
+    foreach my $thing (@{$classifyinfo->{'contains'}}) {
+        last if defined $thing->{'OID'};
+        $doc_pos++;
+    }
+    
+    while ($doc_pos < $headOID) {
+        splice(@{$classifyinfo->{'contains'}}, $doc_pos, 0, $self->get_entry("", $classifytype));
+        $doc_pos++;
+    }
+
+    return $self->get_OID_entry ($tailOID, $classifyinfo->{'contains'}->[($headOID-1)], $title, $classifytype);
+
+    }
+    
+    # else, documents come before nodes
     my $offset = 0;
     foreach my $thing (@{$classifyinfo->{'contains'}}) {

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