Changeset 11860

Timestamp:

2006-05-26T09:48:47+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed the "-michael_mode" option from the plugin, since it is no longer needed now I have an updated version of the images.

Location:

trunk/cic-hcap

Files:

• etc/collect.cfg (modified) (1 diff)
• perllib/plugins/CICPlug.pm (modified) (3 diffs)

trunk/cic-hcap/etc/collect.cfg

@@ -9 +9 @@
 
 plugin      GAPlug
-plugin      CICPlug -cache_directory C:\\mdewsnip\\CIC\\Cache -images_directory C:\\mdewsnip\\CIC\\Images -michael_mode
+plugin      CICPlug -cache_directory C:\\mdewsnip\\CIC\\Cache -images_directory C:\\mdewsnip\\CIC\\Images
 plugin      ArcPlug 
 plugin      RecPlug -use_metadata_files 

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

@@ -39 +39 @@
 my $arguments =
   [ 
-    { 'name' => "michael_mode",
-      'type' => "flag",
-      'reqd' => "no" },
     { 'name' => "images_directory",
       'type' => "string",
@@ -730 +727 @@
     $place_image_file_path =~ s/^[A-Z]:/$self->{'images_directory'}/;
 
-    # A fudge for me because I don't have the updated images...
-    if ($self->{'michael_mode'}) {
-    my $place_image_directory = $place_image_location;
-    $place_image_directory =~ s/^.*images REVISED\\//;
-    $place_image_directory =~ s/\s*\(.*?\)//g;
-    $place_image_directory =~ s/\....$//;
-    $place_image_file_path =~ s/images REVISED\\(.*?)$/images REVISED\\$place_image_directory\\$1/;
-    }
-
     # Create a new section for each image of the place
     my $place_image_section = $doc_obj->insert_section($doc_obj->get_end_child($doc_obj->get_top_section()));
@@ -745 +733 @@
 
     if (!-f $place_image_file_path) {
-    unless ($self->{'michael_mode'}) {
-        print STDERR "<ProcessingError n='$place_image_file_path' p='CICPlug' r='Does not exist'>\n" if ($self->{'gli'});
-        print STDERR "Error: Image $place_image_file_path does not exist.\n";
-    }
+    print STDERR "<ProcessingError n='$place_image_file_path' p='CICPlug' r='Does not exist'>\n" if ($self->{'gli'});
+    print STDERR "Error: Image $place_image_file_path does not exist.\n";
     return;
     }