Changeset 12212

Timestamp:

2006-07-13T14:48:42+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed the old Construction_date metadata and added PlaceConstructionDatesTableHTML metadata instead (with old construction entries). Also added Time_period metadata for each of the construction entries.

File:

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

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

@@ -481 +481 @@
     my $place_institution_sql_handle = $dbh->prepare($place_institution_sql_statement);
 
-    # Prepare SQL statement for getting the Place "date of construction"
-    my $place_construction_date_sql_statement = "SELECT Date FROM tblConstruction_and_Dates WHERE Entry_ID=?";
-    my $place_construction_date_sql_handle = $dbh->prepare($place_construction_date_sql_statement);
+    # 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_handle = $dbh->prepare($place_construction_dates_sql_statement);
 
     # Prepare SQL statement for getting the Place images
@@ -575 +575 @@
     }
 
-    # Get place date of construction, except for landscape sites which have no date
-    $place_construction_date_sql_handle->execute($place_id) or die "Could not execute SQL statement.";
-    my $place_construction_date_value = $place_construction_date_sql_handle->fetchrow();
-    if (!defined($place_construction_date_value) && $place_type eq "Landscape site") {
-        # Landscape sites may not have a construction date
-        $place_construction_date_value = "";
-    }
-    if (!defined($place_construction_date_value)) {
-        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Missing construction date'>\n" if ($self->{'gli'});
-        print STDERR "Error: Place $place_id -- Missing construction date.\n";
-        print $fail_log_handle "Error: Place $place_id -- Missing construction date.\n";
-        $self->{'num_not_processed'}++;
-        next;
-    }
-    &new_metadata_entry($place_doc_obj, "Construction_date", $place_construction_date_value);
-
     # Create place styles mapping
     $place_styles_sql_handle->execute($place_id) or die "Could not execute SQL statement.";
@@ -610 +594 @@
     &new_metadata_entry($place_doc_obj, "State", $place_state_abbr . " " . $state_abbr_to_name_mapping->{$place_state_abbr} . " " . $state_abbr_to_area_mapping->{$place_state_abbr});
 
-    # Create place dates mapping
-    my $place_time_period = $place_construction_date_value;
-    if ($place_construction_date_value =~ /^(\d\d\d\d).*$/) {
-        $place_construction_date_value =~ s/^(\d\d\d\d).*$/$1/;
-        if ($place_construction_date_value < 1800) { $place_time_period = "pre-1800"; }
-        elsif ($place_construction_date_value < 1850) { $place_time_period = "1800-1850"; }
-        elsif ($place_construction_date_value < 1900) { $place_time_period = "1850-1900"; }
-        elsif ($place_construction_date_value < 1945) { $place_time_period = "1900-1945"; }
-        elsif ($place_construction_date_value < 1995) { $place_time_period = "1945-1995"; }
-        else { $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);
+    # Get place construction dates
+    my $place_construction_dates_table_html = "";
+    $place_construction_dates_sql_handle->execute($place_id) or die "Could not execute SQL statement.";
+    while (my $place_construction_dates_match_hashref = $place_construction_dates_sql_handle->fetchrow_hashref()) {
+        my $place_construction_date = $place_construction_dates_match_hashref->{"Date"};
+        if (!defined($place_construction_date)) {
+        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Missing construction date'>\n" if ($self->{'gli'});
+        print STDERR "Error: Place $place_id -- Missing construction date.\n";
+        print $fail_log_handle "Error: Place $place_id -- Missing construction date.\n";
+        next;
+        }
+        # Check for multiline values (these are errors)
+        if ($place_construction_date =~ /\n/) {
+        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Multiline construction date'>\n" if ($self->{'gli'});
+        print STDERR "Error: Place $place_id -- Multiline construction date.\n";
+        print $fail_log_handle "Error: Place $place_id -- Multiline construction date.\n";
+        next;
+        }
+        my $place_construction_note = $place_construction_dates_match_hashref->{"Note"};
+        if (!defined($place_construction_note)) {
+        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Missing construction note'>\n" if ($self->{'gli'});
+        print STDERR "Error: Place $place_id -- Missing construction note.\n";
+        print $fail_log_handle "Error: Place $place_id -- Missing construction note.\n";
+        next;
+        }
+        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>";
+
+        # Convert the construction date to a time period (for searching and browsing)
+        if ($place_construction_date =~ /^(\d\d\d\d).*$/) {
+        $place_construction_date =~ s/^(\d\d\d\d).*$/$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"; }
+        else { $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);
+        }
+    }
+    &new_metadata_entry($place_doc_obj, "PlaceConstructionDatesTableHTML", "<table cellpadding=\"0\" cellspacing=\"0\">" . $place_construction_dates_table_html . "</table>");
 
     # Get place materials (individual buildings only)