Changeset 16009

Timestamp:

2008-06-16T11:12:39+12:00 (16 years ago)

Author:

kjdon

Message:

changed some string keys, added a check for imagemagick before calling generate_images

File:

• gsdl/trunk/perllib/plugins/PagedImagePlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -153 +153 @@
 my $arguments =
     [ { 'name' => "process_exp",
-    'desc' => "{BasPlug.process_exp}",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "string",
     'deft' => &get_default_process_exp(),
     'reqd' => "no" },
       { 'name' => "block_exp",
-    'desc' => "{BasPlug.block_exp}",
+    'desc' => "{BasePlugin.block_exp}",
     'type' => "string",
     'deft' => &get_default_block_exp(),
     'reqd' => "no" },
       { 'name' => "title_sub",
-    'desc' => "{HTMLPlug.title_sub}",
+    'desc' => "{HTMLPlugin.title_sub}",
     'type' => "string", 
     'deft' => "" },
@@ -363 +363 @@
     
     # do generate images
-    my $result = $self->generate_images($filename_full_path, $filename_no_path, $doc_obj, $section);
+    my $result = 0;
+    if ($self->{'image_conversion_available'} == 1) {
+    $result = $self->generate_images($filename_full_path, $filename_no_path, $doc_obj, $section);
+    }
     #overwrite one set in ImageConverter
     $doc_obj->set_metadata_element ($section, "FileFormat", "PagedImage");