Changeset 25558 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

Timestamp:

2012-05-09T14:50:19+12:00 (12 years ago)

Author:

sjm84

Message:

Some minor formatting, and also a minor fix with metadata

File:

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

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

@@ -127 +127 @@
     my $url_encoded_metavalue = $gsdl_cgi->param("metavalue");
     my $url_decoded_metavalue = &unicode::url_decode($url_encoded_metavalue,1);
-
     my $unicode_array = &unicode::utf82unicode($url_decoded_metavalue);
 
     $url_decoded_metavalue = join("",map(chr($_),@$unicode_array));
-
     $gsdl_cgi->param("metavalue",$url_decoded_metavalue);
 
@@ -781 +779 @@
 sub dxml_description
 {
-    my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
-    my $metamode = $parser->{'parameters'}->{'metamode'};
-
-    # 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 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";
-
-    push(@$description_content,"    ", $append_metadata ,"\n        ");
-    $parser->{'parameters'}->{'metamode'} = "done";
-    }
-
+    my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
+    my $metamode = $parser->{'parameters'}->{'metamode'};
+
+    # 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 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";
+    }
 
     # RAW is [$tagname => $attrHash] not $tagname => $attrHash!!
@@ -849 +856 @@
     $parser->{'parameters'}->{'curr_section_depth'} = $new_depth;
     $parser->{'parameters'}->{'curr_section_num'}   = $new_secnum;
-
-    print STDERR "*** In Section: $new_secnum\n";
 }
 
@@ -949 +954 @@
     
     return 0; # return 0 for now to indicate no error
-            
 }
 
@@ -1512 +1516 @@
 ##    $metavalue =~ s/&amp;lt;(.*?)&amp;gt;/<$1>/g;
     $metavalue =~ s/&lt;(.*?)&gt;/<$1>/g;
-    print STDERR "*** set import meta: val = $metavalue\n";
     
     my $metamode   = $self->{'metamode'};