Changeset 12224

Timestamp:

2006-07-14T09:39:49+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed the way place styles are determined, to work around an oddity in the way these are stored in the database.

File:

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

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

@@ -229 +229 @@
 
 
+# This array must match the values in the tblArchTypes table
+my @place_styles_array = (
+    "American colonial",
+    "Federal",
+    "Greek revival",
+    "Italianate",
+    "Gothic revival",
+    "Romanesque revival",
+    "Victorian",
+    "Beaux-Arts classicism",
+    "Colonial revival",
+    "Mission/Mission revival",
+    "Modern/pre-WWII",
+    "Modern/post-WWII",
+    "Postmodern",
+    "Contemporary",
+    "Regionalist/Vernacular",
+    "Other"
+);
+
+
 my $place_functions_mapping = {
     "academic department building" => "",
@@ -496 +517 @@
 
     # Prepare SQL statement for getting the Place building styles
-    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_statement = "SELECT ArchType_ID FROM ArchPlace WHERE Entry_ID=?";
     my $place_styles_sql_handle = $dbh->prepare($place_styles_sql_statement);
     $place_styles_sql_handle->{LongReadLen} = 65536;
@@ -578 +599 @@
     $place_styles_sql_handle->execute($place_id) or die "Could not execute SQL statement.";
     while (my $place_styles_match_hashref = $place_styles_sql_handle->fetchrow_hashref()) {
-        my $place_style = $place_styles_match_hashref->{"Architectural_Classification"};
+        # The ArchType_ID is actually an index into the tblArchType table, NOT a link
+        my $place_style_index = $place_styles_match_hashref->{"ArchType_ID"};
+        my $place_style = $place_styles_array[$place_style_index];
         push(@{$place_style_to_ids_mapping{$place_style}}, $place_doc_obj->get_OID());
         &new_metadata_entry($place_doc_obj, "Style", $place_style);