Changeset 11927 for trunk/cic-hcap

Timestamp:

2006-06-16T13:46:30+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now throws errors on multiline function values (which were causing some problems), and deals with nested parentheses in function values better.

File:

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

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

@@ -539 +539 @@
         next;
         }
+        # Check for multiline values (these are errors)
+        if ($place_function =~ /\n/) {
+        print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Multiline function'>\n" if ($self->{'gli'});
+        print STDERR "Error: Place $place_id -- Multiline function.\n";
+        print $fail_log_handle "Error: Place $place_id -- Multiline function.\n";
+        next;
+        }
         my $place_year = $place_functions_match_hashref->{"Year"};
         if (!defined($place_year)) {
@@ -551 +558 @@
 
         # Create place functions mapping
-        $place_function =~ s/\(.*?\)//g;
+        $place_function =~ s/\(.*\)//g;
         $place_function =~ s/^\s*//;
         $place_function =~ s/\s*$//;