Changeset 7346

Timestamp:

2004-05-19T13:12:25+12:00 (20 years ago)

Author:

davidb

Message:

Collage specific code made more general.

File:

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

trunk/gsdl/perllib/classify.pm

@@ -39 +39 @@
 
 $next_classify_num = 1;
-$collage = 0;
 sub load_classifier_for_info {
     my ($classifier) = shift @_;
@@ -204 +203 @@
         
         if (defined ($tempinfo->{'classifyOID'})) {
-        # the third one is where we want to cut if it's a collage
-        if (defined ($tempinfo->{'Title'}) && $tempinfo->{'Title'} eq "Collage") {
-            $collage = 1;
-        }
         $contains_text .= $tempinfo->{'classifyOID'};
         &print_classify_info ($handle, $tempinfo, $tempinfo->{'classifyOID'},
                       $allclassifications);
-        $collage = 0;
         } elsif (defined ($tempinfo->{'OID'})) {
         $contains_text .= $tempinfo->{'OID'};
@@ -218 +212 @@
         # note: we don't want to print the contents of the books
         } else {
-        if (! $collage) { $contains_text .= "\".$next_subOID"; }
-        else { push (@{$tempinfo->{'childtype'}}, ""); $containstext = "";}
+        
+        # Supress having top-level node in Collage classifier
+        # so no bookshelf icon appears, top-level, along with the
+        # applet
+
+        if (!defined ($tempinfo->{'Title'}) || $tempinfo->{'Title'} ne "Collage") {
+            $contains_text .= "\".$next_subOID"; 
+        }
+
         &print_classify_info ($handle, $tempinfo, "$OID.$next_subOID",
                       $allclassifications);