Changeset 7345 for trunk

Timestamp:

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

Author:

davidb

Message:

Unused code removed.

File:

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

trunk/gsdl/perllib/classify/Collage.pm

@@ -52 +52 @@
     'desc' => "{BasClas.maxDepth}",
     'type' => "string",
-    'deft' => "3"},
+    'deft' => "500"},
 #      { 'name' => "maxDownloads",
 #   'desc' => "{BasClas.maxDownloads}",
@@ -122 +122 @@
              q^geometry/.*/600x300^, \$geometry,
              q^verbosity/.*/3^, \$verbosity,
-             q^maxDepth/.*/3^, \$maxDepth,
+             q^maxDepth/.*/500^, \$maxDepth,
 #            q^maxDownloads/.*/^, \$maxDownloads,
              q^maxDisplay/.*/25^, \$maxDisplay,
@@ -142 +142 @@
     }
 
-    $self->{'collection'} = $ENV{'GSDLCOLLECTION'};
     $self->{'list'} = $list;
     $self->{'title'} = $title;
@@ -172 +171 @@
     my $doc_OID = $doc_obj->get_OID();
     push (@{$self->{'list'}}, $doc_OID);
-
-    foreach $assoc_file (@{$doc_obj->get_assoc_files()}) {
-    push (@{$self->{'imagelist'}}, $assoc_file->[1]);
-    }
-
 }
 
@@ -182 +176 @@
     my $self = shift (@_);
     
-    my @imagelist = ();
-    @imagelist = @{$self->{'imagelist'}};
-
-    my @list = ();
-    @list = @{$self->{'list'}};
-
-    print STDOUT ("$self->{'title'}\n");
-
-    my $classifyinfo = $self->get_entry ($self->{'title'}, "Collage", "Invisible");
-
-    my %collage = ();
-    
+    my $items_per_page = 2; 
+    my $max_items_per_page = 20;
+
+    my @list      = @{$self->{'list'}};
+
+    my $outhandle = $self->{'outhandle'};
+    my $verbosity = $self->{'verbosity'};
+
+    if ($verbosity>1) {
+    print $outhandle ("$self->{'title'}\n");
+    }
+
+    my $collage_head = $self->get_entry ($self->{'title'}, "Collage", "Invisible");
+    my $collage_curr = $self->get_entry("Collage","VList");
+    push (@{$collage_head->{'contains'}},$collage_curr);
+
+    my $global_c=1;
+    my $within_page_c=1;
+
     foreach $oid (@list) {
-    push (@{$collage->{'contains'}}, {'OID'=>$oid});
+    if ($within_page_c>$items_per_page) {
+        my $title = "Items $global_c+";
+        my $nested_node = $self->get_entry($title,"VList");
+        push (@{$collage_curr->{'contains'}}, $nested_node);
+        $collage_curr = $nested_node;
+
+        $within_page_c=1;
+        
+        $items_per_page++ if ($items_per_page < $max_items_per_page);
+    }
+
+    push (@{$collage_curr->{'contains'}}, {'OID'=>$oid});
+    $global_c++;
+    $within_page_c++;
     }
    
-    push (@{$classifyinfo->{'contains'}}, $collage);
-
-    return $classifyinfo;
-
+    return $collage_head;
 }
 
@@ -209 +220 @@
     my ($title, $childtype, $thistype) = @_;
 
-    my $geometry = $self->{'geometry'};
-    my ($x_dim,$y_dim) = ($geometry =~ m/^(.*)x(.*)$/);
-    my $verbosity = $self->{'verbosity'};
-    my $maxDepth = $self->{'maxDepth'};
-#    my $maxDownloads = $self->{'maxDownloads'};
-    my $maxDisplay = $self->{'maxDisplay'};
-    my $imageType = $self->{'imageType'};
-    my $bgcolor = $self->{'bgcolor'};
-    my $refreshDelay = $self->{'refreshDelay'};
-    my $isJava2 = $self->{'isJava2'};
-    my $imageMustNotHave = $self->{'imageMustNotHave'};
-    my $caption = $self->{'caption'};
-
-    if (!defined($maxDownloads)) {
-    $maxDownloads="";
-    }
-
-    my $parameters;
-
-    $parameters = "xdim=".$x_dim;
-    $parameters .= ";ydim=".$y_dim;
-    $parameters .= ";geometry=".$self->{'geometry'};
-    $parameters .= ";verbosity=".$self->{'verbosity'};
-    $parameters .= ";maxDepth=".$self->{'maxDepth'};
-#    $parameters .= ";maxDownloads=".$maxDownloads;
-    $parameters .= ";maxDisplay=".$self->{'maxDisplay'};
-    $parameters .= ";imageType=".$self->{'imageType'};
-    $parameters .= ";bgcolor=".$self->{'bgcolor'};
-    $parameters .= ";refreshDelay=".$self->{'refreshDelay'};
-    $parameters .= ";isJava2=".$self->{'isJava2'};
-    $parameters .= ";caption=".$self->{'caption'};
-
-#    $parameters .= ";imageMustNotHave=".$self->{'imageMustNotHave'};
-
     # organise into classification structure
-    my %classifyinfo = ('thistype'=>$thistype,
-            'childtype'=>$childtype,
+    my %classifyinfo = ('childtype'=>$childtype,
             'Title'=>$title,
                         'parameters'=> $parameters,
             'contains'=>[]);
+
+    $classifyinfo{'thistype'} = $thistype if (defined $thistype);
+
+    if ($childtype eq "Collage") {
+    my $geometry = $self->{'geometry'};
+    my ($x_dim,$y_dim) = ($geometry =~ m/^(.*)x(.*)$/);
+    my $verbosity = $self->{'verbosity'};
+    my $maxDepth = $self->{'maxDepth'};
+#   my $maxDownloads = $self->{'maxDownloads'};
+    my $maxDisplay = $self->{'maxDisplay'};
+    my $imageType = $self->{'imageType'};
+    my $bgcolor = $self->{'bgcolor'};
+    my $refreshDelay = $self->{'refreshDelay'};
+    my $isJava2 = $self->{'isJava2'};
+    my $imageMustNotHave = $self->{'imageMustNotHave'};
+    my $caption = $self->{'caption'};
+    
+    if (!defined($maxDownloads)) {
+        $maxDownloads="";
+    }
+
+    my $parameters;
+
+    $parameters = "xdim=".$x_dim;
+    $parameters .= ";ydim=".$y_dim;
+    $parameters .= ";geometry=".$self->{'geometry'};
+    $parameters .= ";verbosity=".$self->{'verbosity'};
+    $parameters .= ";maxDepth=".$self->{'maxDepth'};
+#   $parameters .= ";maxDownloads=".$maxDownloads;
+    $parameters .= ";maxDisplay=".$self->{'maxDisplay'};
+    $parameters .= ";imageType=".$self->{'imageType'};
+    $parameters .= ";bgcolor=".$self->{'bgcolor'};
+    $parameters .= ";refreshDelay=".$self->{'refreshDelay'};
+    $parameters .= ";isJava2=".$self->{'isJava2'};
+    $parameters .= ";caption=".$self->{'caption'};
+
+#   $parameters .= ";imageMustNotHave=".$self->{'imageMustNotHave'};
+
     
+    $classifyinfo{'parameters'} = $parameters;
+    }
+
     return \%classifyinfo;
 }