Changeset 11926

Timestamp:

2006-06-16T12:28:29+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed some dead code now that generate_place_image_variant returns the image href.

File:

• trunk/cic-hcap/perllib/plugins/CICPlug.pm (modified) (4 diffs)

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

@@ -298 +298 @@
         }
 
-        $self->generate_place_image_variant($institution_doc_obj, $institution_best_place_image_location, "medium");
-        $self->generate_place_image_variant($institution_doc_obj, $institution_best_place_image_location, "large");
-
-        my $institution_best_place_image_large_file_name = $institution_best_place_image_name . "-large.jpg";
-        $institution_best_place_image_large_file_name =~ s/ /%20/g;
-        my $institution_best_place_image_large_file_href = "_httpcollection_/index/assoc/[assocfilepath]/$institution_best_place_image_large_file_name";
-        my $institution_best_place_image_medium_file_name = $institution_best_place_image_name . "-medium.jpg";
-        $institution_best_place_image_medium_file_name =~ s/ /%20/g;
-        my $institution_best_place_image_medium_file_href = "_httpcollection_/index/assoc/[assocfilepath]/$institution_best_place_image_medium_file_name";
+        my $institution_best_place_image_medium_file_href = $self->generate_place_image_variant($institution_doc_obj, $institution_best_place_image_location, "medium");
+        my $institution_best_place_image_large_file_href = $self->generate_place_image_variant($institution_doc_obj, $institution_best_place_image_location, "large");
         &new_metadata_entry($institution_doc_obj, "InstitutionBestPlaceImageHTML", "<a href=\"$institution_best_place_image_large_file_href\"><img src=\"$institution_best_place_image_medium_file_href\"/><br /><span class=\"cictext\">$institution_best_place_image_name</span></a>");
     }
@@ -338 +331 @@
         }
         else {
-        $self->generate_place_image_variant($institution_doc_obj, $institution_campus_plan_image_location, "large");
-
-        my $institution_campus_plan_image_large_file_name = $institution_campus_plan_name . "-large.jpg";
-        $institution_campus_plan_image_large_file_name =~ s/ /%20/g;
-        my $institution_campus_plan_image_large_file_href = "_httpcollection_/index/assoc/[assocfilepath]/$institution_campus_plan_image_large_file_name";
+        my $institution_campus_plan_image_large_file_href = $self->generate_place_image_variant($institution_doc_obj, $institution_campus_plan_image_location, "large");
         $institution_campus_plans_list_html .= "<a href=\"$institution_campus_plan_image_large_file_href\"><span class=\"cictext\">$institution_campus_plan_name</span></a><br />";
         }
@@ -622 +611 @@
         }
         else {
-        $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_small_file_href = $self->generate_place_image_variant($place_doc_obj, $place_image_location, "small");
+        my $place_image_large_file_href = $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_href = "_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_href = "_httpcollection_/index/assoc/[assocfilepath]/$place_image_small_file_name";
             $place_images_html .= "<tr><td valign=\"top\"><a href=\"$place_image_large_file_href\"><img src=\"$place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"$place_image_large_file_href\"><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";
+            $place_images_html .= "<tr><td valign=\"top\"><img src=\"_httpcollection_/images/no_image-small.jpg\"/></td><td valign=\"top\"><span class=\"cictext\">&nbsp;</span></td></tr>\n";
         }
         }
@@ -743 +726 @@
         else {
         # There is no non-PDF image for this place
-        $designer_place_image_small_file_href = "_httpcollection_/images/no_image.jpg";
+        $designer_place_image_small_file_href = "_httpcollection_/images/no_image-small.jpg";
         }