Changeset 11974

Timestamp:

2006-06-29T11:27:01+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now checks place function values are valid.

File:

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

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

@@ -228 +228 @@
 
 
+my $place_functions_mapping = {
+    "academic department building" => "",
+    "administration" => "",
+    "admissions office" => "",
+    "alumni center" => "",
+    "arboretum" => "",
+    "archaeological site" => "",
+    "auditorium" => "",
+    "bell tower" => "",
+    "chapel" => "",
+    "classrooms" => "",
+    "debating society" => "",
+    "dining hall" => "",
+    "facility management building" => "",
+    "faculty offices" => "",
+    "gardens" => "",
+    "greek letter society" => "",
+    "gymnasium" => "",
+    "infirmary" => "",
+    "library" => "",
+    "master plan (campus)" => "",
+    "master plan (landscape)" => "",
+    "memorial site" => "",
+    "museum" => "",
+    "observatory" => "",
+    "old main" => "",
+    "outdoor space" => "",
+    "president's house" => "",
+    "residence hall" => "",
+    "stadium" => "",
+    "student union" => "",
+    "theater" => "",
+    "other" => "",
+};
+
+
 sub read
 {
@@ -622 +658 @@
         $place_functions_table_html .= "<tr><td valign=\"top\"><nobr>$place_year_prefix $place_year</nobr>&nbsp;</td><td valign=\"top\">$place_function</td></tr>";
 
-        # Create place functions mapping
-        $place_function = lc($place_function);
-        $place_function =~ s/\.$//;
-        $place_function =~ s/\(.*\)//g;
-        $place_function =~ s/^\s*//;
-        $place_function =~ s/\s*$//;
-        $place_function =~ s/classroom$/classrooms/;
-        $place_function =~ s/department buildings$/department building/;
-        $place_function =~ s/faculty office$/faculty offices/;
-        $place_function =~ s/garden$/gardens/;
-        $place_function =~ s/residence halls$/residence hall/;
-        next if ($place_function eq "");
-        push(@{$place_function_to_ids_mapping{$place_function}}, $place_doc_obj->get_OID());
+        # Prepare function metadata for browsing and searching
+        my $place_function_to_index = lc($place_function);  # Casefold
+        $place_function_to_index =~ s/^\s*//;  # Remove whitespace from the start
+        if ($place_function_to_index =~ /^master plan/) {
+        $place_function_to_index =~ s/ \(campus,.*/ \(campus\)/;
+        $place_function_to_index =~ s/ \(campus:.*/ \(campus\)/;
+        }
+        else {
+        $place_function_to_index =~ s/\(.*\)//g;  # Remove anything in parentheses
+        }
+        $place_function_to_index =~ s/\s*$//;  # Remove whitespace from the end
+
+        # Deal with common plural cases
+        $place_function_to_index =~ s/classroom$/classrooms/;
+        $place_function_to_index =~ s/department buildings$/department building/;
+        $place_function_to_index =~ s/faculty office$/faculty offices/;
+        $place_function_to_index =~ s/garden$/gardens/;
+        $place_function_to_index =~ s/residence halls$/residence hall/;
+
+        # 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";
+        next;
+        }
+        push(@{$place_function_to_ids_mapping{$place_function_to_index}}, $place_doc_obj->get_OID());
     }
     &new_metadata_entry($place_doc_obj, "Functions", $place_functions);