Changeset 11917

Timestamp:

2006-06-09T16:55:52+12:00 (18 years ago)

Author:

mdewsnip

Message:

Added support for PDFs as place images: these aren't converted, just associated and linked to directly.

File:

• trunk/cic-hcap/perllib/plugins/CICPlug.pm (modified) (1 diff)

trunk/cic-hcap/perllib/plugins/CICPlug.pm

@@ -599 +599 @@
     while (my $place_images_match_hashref = $place_images_sql_handle->fetchrow_hashref) {
         my $place_image_location = $place_images_match_hashref->{"Location"};
-        $self->generate_place_image_variant($place_doc_obj, $place_image_location, "small");
-        $self->generate_place_image_variant($place_doc_obj, $place_image_location, "large");
-
         my $place_image_name = $place_images_match_hashref->{"FileName"};
-        if (defined($place_image_name)) {
-        my $place_image_large_file_name = $place_image_name . "-large.jpg";
-        $place_image_large_file_name =~ s/ /%20/g;
-        my $place_image_large_file_link = "_httpcollection_/index/assoc/[assocfilepath]/$place_image_large_file_name";
-        my $place_image_small_file_name = $place_image_name . "-small.jpg";
-        $place_image_small_file_name =~ s/ /%20/g;
-        my $place_image_small_file_link = "_httpcollection_/index/assoc/[assocfilepath]/$place_image_small_file_name";
-        $place_images_html .= "<tr><td valign=\"top\"><a href=\"$place_image_large_file_link\"><img src=\"$place_image_small_file_link\"/></a></td><td valign=\"top\"><a href=\"$place_image_large_file_link\"><span class=\"cictext\">$place_image_name</span></a></td></tr>\n";
+
+        # Deal with PDF files separately: don't convert, just associate
+        if ($place_image_location =~ /\.pdf$/i) {
+        # Convert the server location of the PDF file into the local location of the file
+        my $place_pdf_file_path = $place_image_location;
+        $place_pdf_file_path =~ s/^[A-Z]:/$self->{'images_directory'}/;
+ 
+        if (-f $place_pdf_file_path) {
+            my ($place_pdf_file_name) = ($place_pdf_file_path =~ /^.+\\(.+)$/);
+            $place_doc_obj->associate_file($place_pdf_file_path, $place_pdf_file_name, undef, $place_doc_obj->get_top_section());
+
+            $place_pdf_file_name =~ s/ /%20/g;
+            my $place_pdf_file_link = "_httpcollection_/index/assoc/[assocfilepath]/$place_pdf_file_name";
+            $place_images_html .= "<tr><td align=\"right\" valign=\"top\"><a href=\"$place_pdf_file_link\">_iconpdf_</a></td><td valign=\"top\"><a href=\"$place_pdf_file_link\"><span class=\"cictext\">$place_image_name (PDF)</span></a></td></tr>\n";
+        }
+        else {
+            print STDERR "<ProcessingError n='$place_pdf_file_path' p='CICPlug' r='Does not exist'>\n" if ($self->{'gli'});
+            print STDERR "Error: File $place_pdf_file_path does not exist.\n";
+            print $fail_log_handle "Error: File $place_pdf_file_path does not exist.\n";
+        }
         }
         else {
-        $place_images_html .= "<tr><td valign=\"top\"><img src=\"_httpcollection_/images/no_image.jpg\"/></td><td valign=\"top\"><span class=\"cictext\">&nbsp;</span></td></tr>\n";
+        $self->generate_place_image_variant($place_doc_obj, $place_image_location, "small");
+        $self->generate_place_image_variant($place_doc_obj, $place_image_location, "large");
+
+        if (defined($place_image_name)) {
+            my $place_image_large_file_name = $place_image_name . "-large.jpg";
+            $place_image_large_file_name =~ s/ /%20/g;
+            my $place_image_large_file_link = "_httpcollection_/index/assoc/[assocfilepath]/$place_image_large_file_name";
+            my $place_image_small_file_name = $place_image_name . "-small.jpg";
+            $place_image_small_file_name =~ s/ /%20/g;
+            my $place_image_small_file_link = "_httpcollection_/index/assoc/[assocfilepath]/$place_image_small_file_name";
+            $place_images_html .= "<tr><td valign=\"top\"><a href=\"$place_image_large_file_link\"><img src=\"$place_image_small_file_link\"/></a></td><td valign=\"top\"><a href=\"$place_image_large_file_link\"><span class=\"cictext\">$place_image_name</span></a></td></tr>\n";
+        }
+        else {
+            $place_images_html .= "<tr><td valign=\"top\"><img src=\"_httpcollection_/images/no_image.jpg\"/></td><td valign=\"top\"><span class=\"cictext\">&nbsp;</span></td></tr>\n";
+        }
         }
     }