Changeset 12219

Timestamp:

2006-07-13T18:01:10+12:00 (18 years ago)

Author:

mdewsnip

Message:

Tidied up the construction dates, and made a few other minor changes.

File:

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

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

@@ -496 +496 @@
 
     # Prepare SQL statement for getting the Place building styles
-    my $place_styles_sql_statement = "SELECT Architectural_Classification FROM tblArchTypes,jnxtblArchPlace WHERE tblArchTypes.ArchType_ID=jnxtblArchPlace.ArchType_ID AND Entry_ID=?";
+    my $place_styles_sql_statement = "SELECT Architectural_Classification FROM tblArchTypes,ArchPlace WHERE tblArchTypes.ArchType_ID=ArchPlace.ArchType_ID AND Entry_ID=?";
     my $place_styles_sql_handle = $dbh->prepare($place_styles_sql_statement);
     $place_styles_sql_handle->{LongReadLen} = 65536;
@@ -600 +600 @@
         my $place_construction_date = $place_construction_dates_match_hashref->{"Date"};
         if (!defined($place_construction_date)) {
+        # Landscape sites are allowed to have no construction information
+        next if ($place_type eq "Landscape site");
+
         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";
@@ -605 +608 @@
         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/;
+        if ($place_construction_date =~ /^(\d{1,4}).*$/) {
+        $place_construction_date = $1;
 
         my $place_time_period;
@@ -631 +618 @@
         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"; }
+        elsif ($place_construction_date <= 1995) { $place_time_period = "1945-1995"; }
+        elsif ($place_construction_date > 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);
         }
+        elsif ($place_construction_date ne "n.d." && $place_construction_date ne "unknown" && $place_construction_date ne "various") {
+        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Warning: Unknown construction date: $place_construction_date'>\n" if ($self->{'gli'});
+        print STDERR "Warning: Place $place_id -- Unknown construction date: $place_construction_date.\n";
+        print $fail_log_handle "Warning: Place $place_id -- Unknown construction date: $place_construction_date.\n";
+        }
+
+        my $place_construction_note = $place_construction_dates_match_hashref->{"Note"};
+        if (!defined($place_construction_note)) {
+        # "No date" entries are allowed to have no construction note
+        next if ($place_construction_date eq "n.d");
+ 
+        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>";
     }
     &new_metadata_entry($place_doc_obj, "PlaceConstructionDatesTableHTML", "<table cellpadding=\"0\" cellspacing=\"0\">" . $place_construction_dates_table_html . "</table>");
@@ -687 +692 @@
         $place_function_to_index =~ s/ \(campus,.*/ \(campus\)/;
         $place_function_to_index =~ s/ \(campus:.*/ \(campus\)/;
+        $place_function_to_index =~ s/ \(landscape,.*/ \(landscape\)/;
         }
         else {
@@ -703 +709 @@
         # 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='Unknown function: $place_function_to_index'>\n" if ($self->{'gli'});
-        print STDERR "Error: Place $place_id -- Unknown function: $place_function_to_index.\n";
-        print $fail_log_handle "Error: Place $place_id -- Unknown function: $place_function_to_index.\n";
+        # 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";
         next;
         }