Changeset 12231

Timestamp:

2006-07-14T14:06:28+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now includes the architect name (and links to their page) in the "Date(s) of Construction" table on the place page.

File:

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

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

@@ -287 +287 @@
 
 
+my %designer_name_to_id_mapping;
+my %designer_name_to_place_ids_mapping;
+
+
 sub read
 {
@@ -503 +507 @@
 
     # Prepare SQL statement for getting the Place construction dates
-    my $place_construction_dates_sql_statement = "SELECT Prefix,Date,Note FROM tblConstruction_and_Dates WHERE Entry_ID=?";
+    my $place_construction_dates_sql_statement = "SELECT Prefix,Date,Note,Architect_Name FROM tblConstruction_and_Dates WHERE Entry_ID=?";
     my $place_construction_dates_sql_handle = $dbh->prepare($place_construction_dates_sql_statement);
 
@@ -634 +638 @@
         # Convert the construction date to a time period (for searching and browsing)
         if ($place_construction_date =~ /^(\d{1,4}).*$/) {
-        $place_construction_date = $1;
+        my $place_construction_year = $1;
 
         my $place_time_period;
-        if ($place_construction_date < 1800) { $place_time_period = "pre-1800"; }
-        elsif ($place_construction_date < 1850) { $place_time_period = "1800-1850"; }
-        elsif ($place_construction_date < 1900) { $place_time_period = "1850-1900"; }
-        elsif ($place_construction_date < 1945) { $place_time_period = "1900-1945"; }
-        elsif ($place_construction_date <= 1995) { $place_time_period = "1945-1995"; }
-        elsif ($place_construction_date > 1995) { $place_time_period = "post-1995"; }
+        if ($place_construction_year < 1800) { $place_time_period = "pre-1800"; }
+        elsif ($place_construction_year < 1850) { $place_time_period = "1800-1850"; }
+        elsif ($place_construction_year < 1900) { $place_time_period = "1850-1900"; }
+        elsif ($place_construction_year < 1945) { $place_time_period = "1900-1945"; }
+        elsif ($place_construction_year <= 1995) { $place_time_period = "1945-1995"; }
+        elsif ($place_construction_year > 1995) { $place_time_period = "post-1995"; }
         push(@{$place_date_to_ids_mapping{$place_time_period}}, $place_doc_obj->get_OID());
         &new_metadata_entry($place_doc_obj, "Time_period", $place_time_period);
@@ -662 +666 @@
         next;
         }
+
+        # Get the architects for this construction and remember them for later for the designer objects
+        my $place_construction_architect = $place_construction_dates_match_hashref->{"Architect_Name"} || "";
+        my $place_construction_architect_links = "";
+        foreach my $designer_name (split(/;/, $place_construction_architect)) {
+        $designer_name =~ s/\(.*?\)//g;
+        $designer_name =~ s/^\s*//;
+        $designer_name =~ s/\s*$//;
+
+        my $designer_id = $designer_name_to_id_mapping{$designer_name};
+        if (!defined($designer_id)) {
+            $designer_id = scalar(keys(%designer_name_to_id_mapping)) + 1;
+            $designer_name_to_id_mapping{$designer_name} = $designer_id;
+        }
+        $place_construction_architect_links .= "<a href=\"_gwcgi_?a=d&d=d$designer_id\">$designer_name</a> ";
+        push(@{$designer_name_to_place_ids_mapping{$designer_name}}, $place_id);
+        }
+
         my $place_construction_date_prefix = $place_construction_dates_match_hashref->{"Prefix"} || "";
-        $place_construction_dates_table_html .= "<tr><td valign=\"top\"><nobr>$place_construction_date_prefix $place_construction_date</nobr>&nbsp;</td><td valign=\"top\">$place_construction_note</td></tr>";
+        $place_construction_dates_table_html .= "<tr><td valign=\"top\"><nobr>$place_construction_date_prefix $place_construction_date</nobr>&nbsp;</td><td valign=\"top\">$place_construction_note $place_construction_architect_links</td></tr>";
     }
     &new_metadata_entry($place_doc_obj, "PlaceConstructionDatesTableHTML", "<table cellpadding=\"0\" cellspacing=\"0\">" . $place_construction_dates_table_html . "</table>");
@@ -732 +754 @@
         # Check it is one of the valid function values
         if (!defined($place_functions_mapping->{$place_function_to_index})) {
-        # print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Warning: Unknown function: $place_function_to_index'>\n" if ($self->{'gli'});
+        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Warning: Unknown function: $place_function_to_index'>\n" if ($self->{'gli'});
         print STDERR "Warning: Place $place_id -- Unknown function: $place_function_to_index.\n";
         print $fail_log_handle "Warning: Place $place_id -- Unknown function: $place_function_to_index.\n";
@@ -853 +875 @@
     my $fail_log_handle = $self->{'failhandle'};
 
-    # Prepare SQL statement for getting all the Architects from the Place table
-    my $designer_sql_statement = "SELECT Architect_Name,Entry_ID FROM tblConstruction_and_dates";
-    my $designer_sql_handle = $dbh->prepare($designer_sql_statement);
-    $designer_sql_handle->{LongReadLen} = 65536;
-    $designer_sql_handle->execute() or die "Could not execute SQL statement.";
-
     # Prepare SQL statement for getting the Place name
     my $place_name_sql_statement = "SELECT Current_name FROM tblPlace WHERE Entry_ID=?";
@@ -876 +892 @@
     $place_images_sql_handle->{LongReadLen} = 65536;
 
-    # Get a list of all the designers, and the places they worked on
-    my %designer_name_to_place_ids_mapping;
-    my %designer_name_to_id_mapping;
+    # Create a document object for each designer
     my %designer_id_to_name_mapping;
-    my $designer_count = 0;
-    while (my $designer_hashref = $designer_sql_handle->fetchrow_hashref) {
-    my $designer_names_string = $designer_hashref->{"Architect_Name"};
-    next if !defined($designer_names_string);
-    foreach my $designer_name (split(/;/, $designer_names_string)) {
-        $designer_name =~ s/\(.*?\)//g;
-        $designer_name =~ s/^\s*//;
-        $designer_name =~ s/\s*$//;
-
-        if (!defined($designer_name_to_id_mapping{$designer_name})) {
-        $designer_count++;
-        $designer_name_to_id_mapping{$designer_name} = "d" . $designer_count;
-        }
-
-        $designer_id_to_name_mapping{$designer_name_to_id_mapping{$designer_name}} = $designer_name;
-        push(@{$designer_name_to_place_ids_mapping{$designer_name}}, $designer_hashref->{"Entry_ID"});
-    }
-    }
-
-    # Create a document object for each designer
-    foreach my $designer_name (keys %designer_name_to_place_ids_mapping) {
+    foreach my $designer_name (keys %designer_name_to_id_mapping) {
     my $designer_id = $designer_name_to_id_mapping{$designer_name};
     # print STDERR "       Designer $designer_id\n";
     my $designer_doc_obj = new doc($self->{'filename'} . "-", "indexed_doc");
-    $designer_doc_obj->set_OID($designer_id);
+    $designer_doc_obj->set_OID("d$designer_id");
     &new_metadata_entry($designer_doc_obj, "DocumentType", "Designer");
 
     &new_metadata_entry($designer_doc_obj, "Designer_name", $designer_name);
 
-    my $designer_places_list_html = "";
-    foreach my $designer_place_id (@{$designer_name_to_place_ids_mapping{$designer_name}}) {
+    # Get designer places
+    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.";
@@ -943 +938 @@
     $self->{'processor'}->process($designer_doc_obj);
     $self->{'num_processed'}++;
+
+    $designer_id_to_name_mapping{$designer_doc_obj->get_OID()} = $designer_name;
     }
 
@@ -1001 +998 @@
     else {
         print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Could not parse reference: $place_reference'>\n" if ($self->{'gli'});
-        print STDERR "Warning: Place $place_id -- Could not parse reference: $place_reference\n";
+        # print STDERR "Warning: Place $place_id -- Could not parse reference: $place_reference\n";
         print $fail_log_handle "Warning: Place $place_id -- Could not parse reference: $place_reference\n";
     }