Changeset 19054

Timestamp:

2009-04-19T19:31:40+12:00 (15 years ago)

Author:

davidb

Message:

MaxImageWidth and MaxImageHeight set as metadata

Location:

gsdl/trunk/perllib/plugins

Files:

• ImageConverter.pm (modified) (3 diffs)
• PagedImagePlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -159 +159 @@
     return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
 
-    if ($self->{'cache_generated_images'}) {
+    if ($self->{'enable_cache'}) {
     $self->init_cache_for_file($filename_full_path);
     }
@@ -224 +224 @@
     $doc_obj->add_metadata ($section, "ImageHeight", $image_height);
     $doc_obj->add_metadata ($section, "ImageSize",   $image_size);
+
+    if ((defined $self->{'MaxImageWidth'}) 
+    && ($image_width > $self->{'MaxImageWidth'})) {
+    $self->{'MaxImageWidth'} = $image_width;
+    }
+    if ((defined $self->{'MaxImageHeight'})
+    && ($image_height > $self->{'MaxImageHeight'})) {
+    $self->{'MaxImageHeight'} = $image_height;
+    }
+
 
     $doc_obj->add_metadata ($section, "srclink", "<a href=\"_httpprefix_/collect/[collection]/index/assoc/$assocfilemeta/[Image]\">");
@@ -335 +345 @@
     # Determine the full name and path of the output file
     my $target_file_path;
-    if ($self->{'cache_generated_images'}) {
+    if ($self->{'enable_cache'}) {
     my $cached_image_dir = $self->{'cached_dir'};
     my $image_root = $self->{'cached_file_root'};

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -282 +282 @@
     print STDERR "<Processing n='$file' p='PagedImagePlugin'>\n" if ($gli);
     
+    $self->{'MaxImageWidth'} = 0;
+    $self->{'MaxImageHeight'} = 0;
     
     # here we need to decide if we have an old text .item file, or a new xml 
@@ -496 +498 @@
     
     # add numpages metadata
-    $doc_obj->set_utf8_metadata_element ($doc_obj->get_top_section(), 'NumPages', $self->{'num_pages'});
-
+    my $topsection = $doc_obj->get_top_section();
+
+    $doc_obj->set_utf8_metadata_element ($topsection, 'NumPages', $self->{'num_pages'});
+
+    $doc_obj->set_utf8_metadata_element($topsection,"MaxImageWidth",$self->{'MaxImageWidth'});
+    $doc_obj->set_utf8_metadata_element($topsection,"MaxImageHeight",$self->{'MaxImageHeight'});
+    $self->{'MaxImageWidth'} = undef;
+    $self->{'MaxImageHeight'} = undef;
     
 }
@@ -584 +592 @@
     # add numpages metadata
     $doc_obj->set_utf8_metadata_element ($topsection, 'NumPages', "$num");
+
+    $doc_obj->set_utf8_metadata_element($topsection,"MaxImageWidth",$self->{'MaxImageWidth'});
+    $doc_obj->set_utf8_metadata_element($topsection,"MaxImageHeight",$self->{'MaxImageHeight'});
+    $self->{'MaxImageWidth'} = undef;
+    $self->{'MaxImageHeight'} = undef;
+
+
     return $doc_obj;
 }