Changeset 12396

Timestamp:

2006-08-03T16:39:13+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now uses the Image_Order field of tblImages to sort the place images, and no longer assigns the same place multiple times to a designer.

File:

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

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

@@ -336 +336 @@
     $institution_best_place_image_location_sql_handle->{LongReadLen} = 65536;
 
-    # Prepare SQL statement for getting the Institution places images
+    # Prepare SQL statement for getting the Institution places images (only used to check if an institution has some images)
     my $institution_places_images_sql_statement = "SELECT FileName FROM tblImages,tblPlace WHERE tblImages.FileType=1 AND tblImages.Entry_ID=tblPlace.Entry_ID AND tblPlace.Institution_ID=?";
     my $institution_places_images_sql_handle = $dbh->prepare($institution_places_images_sql_statement);
@@ -511 +511 @@
 
     # 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_statement = "SELECT FileName,Location FROM tblImages WHERE FileType=1 AND Entry_ID=? ORDER BY Image_Order";
     my $place_images_sql_handle = $dbh->prepare($place_images_sql_statement);
     $place_images_sql_handle->{LongReadLen} = 65536;
@@ -888 +888 @@
 
     # 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_statement = "SELECT Location FROM tblImages WHERE FileType=1 AND Location NOT LIKE '%.pdf' AND Entry_ID=? ORDER BY Image_Order";
     my $place_images_sql_handle = $dbh->prepare($place_images_sql_statement);
     $place_images_sql_handle->{LongReadLen} = 65536;
@@ -905 +905 @@
     # Get designer places
     my $designer_places_list_html = "";
-        foreach my $designer_place_id (@{$designer_name_to_place_ids_mapping{$designer_name}}) {
+    my $last_designer_place_id = "";
+        foreach my $designer_place_id (sort(@{$designer_name_to_place_ids_mapping{$designer_name}})) {
+        # The designer may have worked on a place multiple times, so check for this
+        next if ($designer_place_id eq $last_designer_place_id);
+        $last_designer_place_id = $designer_place_id;
+
         # Get place name
         $place_name_sql_handle->execute($designer_place_id) or die "Could not execute SQL statement.";