Changeset 25891

Timestamp:

2012-07-03T16:28:22+12:00 (11 years ago)

Author:

sjm84

Message:

Fixed a bug that wiped out doc.xml files if metadata was changed at the root level

File:

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

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

@@ -725 +725 @@
     my $metaname = $parser->{'parameters'}->{'metaname'};
     my $metamode = $parser->{'parameters'}->{'metamode'};
+    
+    print STDERR "**** IN METADATA \n";
     
     my $opt_doc_secnum = $parser->{'parameters'}->{'secnum'};
@@ -763 +765 @@
                 $parser->{'parameters'}->{'metamode'} = "done";
             }
-            elsif(defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} == $attrHash->{'_content'})
+            elsif(defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'})
             {
                 my $metavalue = $parser->{'parameters'}->{'metavalue'};
@@ -782 +784 @@
     my $metamode = $parser->{'parameters'}->{'metamode'};
 
+    print STDERR "**** IN DESCRIPTION! \n";
+    
     # Accumulate the metadata
     # NOTE: This appends new metadata element to all description fields.
     # If there are multiple Sections/SubSections, the new metadata block will get appended to all of them
-    if (($metamode eq "accumulate") || ($metamode eq "override")) {
+    if (($metamode eq "accumulate")) {
+        print STDERR "**** ACCUMULATE! \n";
         # If get to here and metamode is override, the this means there 
         # was no existing value to overide => treat as an append operation
@@ -802 +807 @@
         my $description_content = $attrHash->{'_content'};
     
-        ##  print STDERR "**** appending to doc.xml\n";
+        print STDERR "**** appending to doc.xml\n";
 
         if (ref($description_content)) {
@@ -815 +820 @@
         $parser->{'parameters'}->{'metamode'} = "done";
     }
+    else {
+        print STDERR "**** NOT ACCUMULATE?!? \n";
+    }
 
     # RAW is [$tagname => $attrHash] not $tagname => $attrHash!!
@@ -827 +835 @@
     my $new_depth = scalar(@$contextArray);
 
+    print STDERR "**** START SECTION \n";
+    
     if ($new_depth == 1) {
     $parser->{'parameters'}->{'curr_section_depth'} = 1;
@@ -856 +866 @@
     $parser->{'parameters'}->{'curr_section_depth'} = $new_depth;
     $parser->{'parameters'}->{'curr_section_num'}   = $new_secnum;
+    
+    1;
 }
 
@@ -904 +916 @@
     my ($gsdl_cgi, $doc_xml_filename, $metaname, $metavalue, $metapos, $metamode, $opt_secnum, $prevmetavalue) = @_;
 
+    $gsdl_cgi->generate_ok_message("IN EDIT DOC XML\n****************************\n");
+    $gsdl_cgi->generate_ok_message("doc_xml_filename = $doc_xml_filename\n");
+    $gsdl_cgi->generate_ok_message("metaname = $metaname\n");
+    $gsdl_cgi->generate_ok_message("metavalue = $metavalue\n");
+    $gsdl_cgi->generate_ok_message("metapos = $metapos\n");
+    $gsdl_cgi->generate_ok_message("metamode = $metamode\n");
+    $gsdl_cgi->generate_ok_message("opt_secnum = $opt_secnum\n");
+    $gsdl_cgi->generate_ok_message("prevmetavalue = $prevmetavalue\n");
+    
     # To monitor which section/subsection number we are in
     my @start_rules = 
@@ -932 +953 @@
 {
     my $self = shift @_;
-    my ($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,$docid,$metaname,$metapos,$metavalue,$metamode,$prevmetavalue) = @_;
+    my ($gsdl_cgi, $archive_dir, $collect_dir, $collect, $infodbtype, $docid, $metaname, $metapos, $metavalue, $metamode, $prevmetavalue) = @_;
+    
+    $gsdl_cgi->generate_ok_message("IN SET ARCHIVES METADATA ENTRY\n****************************\n");
+    $gsdl_cgi->generate_ok_message("archive_dir = $archive_dir\n");
+    $gsdl_cgi->generate_ok_message("collect_dir = $collect_dir\n");
+    $gsdl_cgi->generate_ok_message("collect = $collect\n");
+    $gsdl_cgi->generate_ok_message("infodbtype = $infodbtype\n");
+    $gsdl_cgi->generate_ok_message("docid = $docid\n");
+    $gsdl_cgi->generate_ok_message("metaname = $metaname\n");
+    $gsdl_cgi->generate_ok_message("metapos = $metapos\n");
+    $gsdl_cgi->generate_ok_message("metavalue = $metavalue\n");
+    $gsdl_cgi->generate_ok_message("metamode = $metamode\n");
+    $gsdl_cgi->generate_ok_message("prevmetavalue = $prevmetavalue\n");
     
     # Obtain the doc.xml path for the specified docID