Changeset 8445

Timestamp:

2004-11-03T17:02:08+13:00 (19 years ago)

Author:

kjdon

Message:

fixed a bug I introduced with the remove_empty_classifications thing - it was not calling check_contents but thats needed to set numleafdocs

File:

• trunk/gsdl/perllib/classify.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify.pm

@@ -184 +184 @@
  
     # don't want empty classifications
-    return if ($remove_empty_classifications && &check_contents ($classifyinfo) == 0);
+    return if (&check_contents ($classifyinfo, $remove_empty_classifications) == 0 && $remove_empty_classifications);
    
     $OID = $classifyinfo->{'classifyOID'} if defined ($classifyinfo->{'classifyOID'});
@@ -260 +260 @@
 
 sub check_contents {
-    my ($classifyinfo) = @_;
+    my ($classifyinfo,$remove_empty_classifications) = @_;
+    $remove_empty_classifications = 0 unless ($remove_empty_classifications);
     my $num_leaf_docs = 0;
     my $sub_num_leaf_docs = 0;
@@ -274 +275 @@
         $num_leaf_docs += $sub_num_leaf_docs;
     } else {
-        # section contains no books so we want to remove 
-        # it from its parents contents
-        $content = undef;
+        if ($remove_empty_classifications){
+        # section contains no books so we want to remove 
+        # it from its parents contents
+        $content = undef;
+        }
     }
     }