Changeset 27112

Timestamp:

2013-03-22T16:39:00+13:00 (11 years ago)

Author:

ak19

Message:

Adding in error processing code for when an invalid subsection is entered. Separate commit to allow easy uncommiting of the changes in this revision, so that the bugfix in the previous commit is not accidentally uncommited.

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -793 +793 @@
     
     if ($metamode ne "done" && $curr_secnum ne $opt_doc_secnum) {
-    print STDERR "@@@ $tagname Finished processing FINAL Section [$curr_secnum|$opt_doc_secnum]\n";
+    print STDERR "@@@ $tagname Finished processing FINAL Section.\n";
 
     my $metaname = $parser->{'parameters'}->{'metaname'};
     my $metavalue = $parser->{'parameters'}->{'metavalue'};
     
-    print STDERR "@@@ Unknown requested section number $opt_doc_secnum\n";
-    print STDERR "\tas final section number in document was $curr_secnum\n";
-    print STDERR "\tMetadata value '$metavalue' for meta '$metaname'\n";
-    print STDERR "\tin section $opt_doc_secnum discarded.\n";
+    print STDERR "@@@ Requested section number $opt_doc_secnum not found.\n";
+    print STDERR "\t(last seen section number in document was $curr_secnum)\n";
+    print STDERR "\tDiscarded metadata value '$metavalue' for meta '$metaname'\n";
+    print STDERR "\tin section $opt_doc_secnum.\n";
+    $parser->{'custom_err_msg'} = "Requested section number $opt_doc_secnum not found.";
     }
     
@@ -962 +963 @@
     }
     }
+
+    # copy across any custom error information that was stored during parsing
+    $self->{'error_msg'} = $parser->{'custom_err_msg'} if(defined $parser->{'custom_err_msg'});    
 }
 
@@ -1053 +1057 @@
     $self->edit_doc_xml($gsdl_cgi,$doc_xml_filename,
             $metaname,$metavalue,$metapos,$metamode,$docid_secnum,$prevmetavalue);
-    
-    return 0; # return 0 for now to indicate no error
+
+    # return 0; # return 0 for now to indicate no error
+    return (defined $self->{'error_msg'}) ? 1 : 0;
 }
 
@@ -1117 +1122 @@
         my $mess .= "Failed to set archives metadata key: $docid\n";
         $mess .= "Exit status: $status\n";
-        $mess .= "System Error Message: $!\n";
+        if(defined $self->{'error_msg'}) {
+            $mess .= "Error Message: $self->{'error_msg'}\n";
+        } else {
+            $mess .= "System Error Message: $!\n";
+        }
         $mess .= "-" x 20 . "\n";