Changeset 27007 for main/trunk/greenstone2

Timestamp:

2013-03-05T12:04:19+13:00 (11 years ago)

Author:

davidb

Message:

Additional case for storing metadata now handled: that of when the mode is set to 'override' but when no exising metadata exits. The code now spots that no existing value was found and switches to treating it effectively like an "accumulate" request.

Some code type up performed also (tweaks to some debugging output), and the concatenation of strings before printing them out through the GSDLcgi module (before it was calling the GSDLcgi module function each time, which added MIME header information each time).

File:

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

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

@@ -726 +726 @@
     my $metamode = $parser->{'parameters'}->{'metamode'};
     
-    print STDERR "**** IN METADATA \n";
+    print STDERR "**** Processing closing </Metadata> tag\n";
     
     my $opt_doc_secnum = $parser->{'parameters'}->{'secnum'};
@@ -784 +784 @@
     my $metamode = $parser->{'parameters'}->{'metamode'};
 
-    print STDERR "**** IN DESCRIPTION! \n";
+    print STDERR "**** Processing a closing </Description> tag \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")) {
-        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
-
-        # Tack a new metadata tag on to the end of the <Metadata>+ block
-        my $metaname = $parser->{'parameters'}->{'metaname'};
-        my $metavalue = $parser->{'parameters'}->{'metavalue'};
-    
-        my $metadata_attr = { 
-            '_content' => $metavalue, 
-            'name' => $metaname, 
-            'mode' => "accumulate" 
-        };
-
-        my $append_metadata = [ "Metadata" => $metadata_attr ];
-        my $description_content = $attrHash->{'_content'};
-    
-        print STDERR "**** appending to doc.xml\n";
-
-        if (ref($description_content)) {
-            # got some existing interesting nested content
-            push(@$description_content, "    ", $append_metadata ,"\n        ");
-        }
-        else {
-            #description_content is most likely a string such as "\n"
-            $attrHash->{'_content'} = [$description_content, "    ", $append_metadata ,"\n" ];
-        }
-        
-        $parser->{'parameters'}->{'metamode'} = "done";
-    }
+
+    if (($metamode eq "accumulate") || ($metamode eq "override")) {
+        if ($metamode eq "override") {
+        print "No metadata value to override.  Switching 'metamode' to 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
+        
+        # Tack a new metadata tag on to the end of the <Metadata>+ block
+        my $metaname = $parser->{'parameters'}->{'metaname'};
+        my $metavalue = $parser->{'parameters'}->{'metavalue'};
+        
+        my $metadata_attr = { 
+        '_content' => $metavalue, 
+        'name' => $metaname, 
+        'mode' => "accumulate" 
+        };
+        
+        my $append_metadata = [ "Metadata" => $metadata_attr ];
+        my $description_content = $attrHash->{'_content'};
+        
+        print "Appending metadata to doc.xml\n";
+        
+        if (ref($description_content)) {
+        # got some existing interesting nested content
+        push(@$description_content, "    ", $append_metadata ,"\n        ");
+        }
+        else {
+        #description_content is most likely a string such as "\n"
+        $attrHash->{'_content'} = [$description_content, "    ", $append_metadata ,"\n" ];
+        }
+        
+        $parser->{'parameters'}->{'metamode'} = "done";
+    }       
     else {
-        print STDERR "**** NOT ACCUMULATE?!? \n";
+        # metamode most likely "done" signifying that it has already found a position to add the metadata to. 
+##      print STDERR "**** NOT ACCUMULATE?!? \n";
     }
 
@@ -916 +919 @@
     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");
+    my $info_mess = <<RAWEND;
+****************************
+  edit_doc_xml()
+****************************
+doc_xml_filename = $doc_xml_filename
+metaname = $metaname
+metavalue = $metavalue
+metapos = $metapos
+metamode = $metamode
+opt_secnum = $opt_secnum
+prevmetavalue = $prevmetavalue
+****************************
+RAWEND
+
+    $gsdl_cgi->generate_message($info_mess);
     
     # To monitor which section/subsection number we are in
@@ -955 +965 @@
     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");
+    my $info_mess = <<RAWEND;
+****************************
+  set_archives_metadata_entry()
+****************************
+archive_dir = $archive_dir
+collect_dir = $collect_dir
+collect = $collect
+infodbtype = $infodbtype
+docid = $docid
+metaname = $metaname
+metapos = $metapos
+metavalue = $metavalue
+metamode = $metamode
+prevmetavalue = $prevmetavalue
+****************************
+RAWEND
+
+    $gsdl_cgi->generate_message($info_mess);
     
     # Obtain the doc.xml path for the specified docID