Changeset 11924

Timestamp:

2006-06-16T12:10:04+12:00 (18 years ago)

Author:

mdewsnip

Message:

Lots of improvements to designer pages: now displays places the same as other browse pages, and PDFs are ignored.

File:

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

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

@@ -670 +670 @@
     $designer_sql_handle->execute() or die "Could not execute SQL statement.";
 
-    # Prepare SQL statement for getting the Place images
-    my $place_images_sql_statement = "SELECT FileName,Location FROM tblImages WHERE FileType=1 AND Entry_ID=?";
-    my $place_images_sql_handle = $dbh->prepare($place_images_sql_statement);
-    $place_images_sql_handle->{LongReadLen} = 65536;
+    # Prepare SQL statement for getting the Place name
+    my $place_name_sql_statement = "SELECT Current_name FROM tblPlace WHERE Entry_ID=?";
+    my $place_name_sql_handle = $dbh->prepare($place_name_sql_statement);
+
+    # Prepare SQL statement for getting the Place institution
+    my $place_institution_sql_statement = "SELECT Institution_Name FROM tblInstitution,tblPlace WHERE tblInstitution.Institution_ID=tblPlace.Institution_ID and tblPlace.Entry_ID=?";
+    my $place_institution_sql_handle = $dbh->prepare($place_institution_sql_statement);
 
     # Prepare SQL statement for getting the Place "date of construction"
@@ -679 +682 @@
     my $place_construction_date_sql_handle = $dbh->prepare($place_construction_date_sql_statement);
 
-    # Prepare SQL statement for getting the Place name
-    my $place_name_sql_statement = "SELECT Current_name FROM tblPlace WHERE Entry_ID=?";
-    my $place_name_sql_handle = $dbh->prepare($place_name_sql_statement);
+    # Prepare SQL statement for getting the Place non-PDF images
+    my $place_images_sql_statement = "SELECT Location FROM tblImages WHERE FileType=1 AND Location NOT LIKE '%.pdf' AND Entry_ID=?";
+    my $place_images_sql_handle = $dbh->prepare($place_images_sql_statement);
+    $place_images_sql_handle->{LongReadLen} = 65536;
 
     # Get a list of all the designers, and the places they worked on
@@ -716 +720 @@
     &new_metadata_entry($designer_doc_obj, "Designer_name", $designer_name);
 
-    my $designer_places_image_html = "";
+    my $designer_places_list_html = "";
     foreach my $designer_place_id (@{$designer_name_to_place_ids_mapping{$designer_name}}) {
+        # Get place name
+        $place_name_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";
+        my $designer_place_name = $place_name_sql_handle->fetchrow();
+
+        # Get place institution name
+        $place_institution_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";
+        my $designer_place_institution_name = $place_institution_sql_handle->fetchrow();
+
         # Get place date of construction
         $place_construction_date_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";
         my $designer_place_construction_date_value = $place_construction_date_sql_handle->fetchrow() || "";
 
-        # Get the first image for this place
-        $place_images_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";
-        my $designer_place_image_match_hashref = $place_images_sql_handle->fetchrow_hashref();
-        if (defined($designer_place_image_match_hashref)) {
-        my $designer_place_image_location = $designer_place_image_match_hashref->{"Location"};
-        $self->generate_place_image_variant($designer_doc_obj, $designer_place_image_location, "small");
-
-        my $designer_place_image_name = $designer_place_image_match_hashref->{"FileName"};
-        my $designer_place_image_small_file_href;
-        if (defined($designer_place_image_name)) {
-            my $designer_place_image_small_file_name = $designer_place_image_name . "-small.jpg";
-            $designer_place_image_small_file_name =~ s/ /%20/g;
-            $designer_place_image_small_file_href = "_httpcollection_/index/assoc/[assocfilepath]/$designer_place_image_small_file_name";
-        }
-        else {
-            # Get the name of this place (since we don't have a filename)
-            $place_name_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";
-            $designer_place_image_name = $place_name_sql_handle->fetchrow() || "";
-            $designer_place_image_small_file_href = "_httpcollection_/images/no_image.jpg";
-        }
-        $designer_places_image_html .= "<tr><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$designer_place_id\"><img src=\"$designer_place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$designer_place_id\"><span class=\"cictext\">$designer_place_image_name</span></a><br /><b>Date of construction:</b> $designer_place_construction_date_value</td></tr>\n";
-        }
-    }
-
-    &new_metadata_entry($designer_doc_obj, "DesignerPlacesImageHTML", "<table>" . $designer_places_image_html . "</table>");
+        # Get the first non-PDF image for this place
+        my $designer_place_image_small_file_href;
+            $place_images_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";
+        my $designer_place_image_location = $place_images_sql_handle->fetchrow();
+        if (defined($designer_place_image_location)) {
+        $designer_place_image_small_file_href = $self->generate_place_image_variant($designer_doc_obj, $designer_place_image_location, "small");
+        }
+        else {
+        # There is no non-PDF image for this place
+        $designer_place_image_small_file_href = "_httpcollection_/images/no_image.jpg";
+        }
+
+        $designer_places_list_html .= "<tr><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$designer_place_id\"><img src=\"$designer_place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$designer_place_id\">$designer_place_name</a>, $designer_place_institution_name<br /><b>Date of construction:</b> $designer_place_construction_date_value</td></tr>\n";
+    }
+
+    &new_metadata_entry($designer_doc_obj, "DesignerPlacesListHTML", "<table>" . $designer_places_list_html . "</table>");
 
     $designer_doc_obj->add_utf8_text($designer_doc_obj->get_top_section(), "Some dummy text.");