Changeset 12363

Timestamp:

2006-08-01T09:50:34+12:00 (18 years ago)

Author:

kjdon

Message:

sort_metadata renamed to store_output_info_reference, and modified the sortmeta stuff to use a comma separated list

Location:

trunk/gsdl/perllib/plugouts

Files:

• BasPlugout.pm (modified) (1 diff)
• DSpacePlugout.pm (modified) (1 diff)
• GAPlugout.pm (modified) (1 diff)
• METSPlugout.pm (modified) (1 diff)

trunk/gsdl/perllib/plugouts/BasPlugout.pm

@@ -388 +388 @@
 }
 
-sub sort_metadata{
+sub store_output_info_reference {
     my $self = shift (@_);
     my ($doc_obj) = @_;
 
-    # do the sortmeta thing       
-    my $metadata = $doc_obj->get_metadata_element($doc_obj->get_top_section(),$self->{'sortmeta'}) 
-      if defined $self->{'sortmeta'};
-    
-    if ($metadata) {
-    # do remove prefix/suffix
-    $metadata =~ s/^$self->{'removeprefix'}// if defined $self->{'removeprefix'};          
-    $metadata =~ s/$self->{'removesuffix'}$// if defined $self->{'removesuffix'};
-        
-    $metadata = &sorttools::format_metadata_for_sorting($self->{'sortmeta'}, $metadata, $doc_obj);
-    }
-
     my $output_info = $self->{'output_info'};
-    
+    my $metaname = $self->{'sortmeta'};
+    if (!defined $metaname || $metaname !~ /\S/) {
+    $output_info->add_info($doc_obj->get_OID(),$self->{'short_doc_file'}, undef, "");
+    return;
+    }
+    
+    my $metadata = "";
+    my $top_section = $doc_obj->get_top_section();
+    
+    my @commameta_list = split(/,/, $metaname);
+    foreach my $cmn (@commameta_list) {
+    my $meta = $doc_obj->get_metadata_element($top_section, $cmn);
+    if ($meta) {
+        # do remove prefix/suffix - this will apply to all values
+        $meta =~ s/^$self->{'removeprefix'}// if defined $self->{'removeprefix'};          
+        $meta =~ s/$self->{'removesuffix'}$// if defined $self->{'removesuffix'};
+        $meta = &sorttools::format_metadata_for_sorting($cmn, $meta, $doc_obj);
+        $metadata .= $meta if ($meta);
+    }
+    }
+
     # store reference in the output_info     
     $output_info->add_info($doc_obj->get_OID(),$self->{'short_doc_file'}, undef, $metadata);

trunk/gsdl/perllib/plugouts/DSpacePlugout.pm

@@ -124 +124 @@
        
     $self->{'short_doc_file'} =  &util::filename_cat ($doc_dir, "dublin_core.xml"); 
-    $self->sort_metadata($doc_obj);
+    $self->store_output_info_reference($doc_obj);
 }
 

trunk/gsdl/perllib/plugouts/GAPlugout.pm

@@ -95 +95 @@
   $self->{'short_doc_file'} = util::filename_cat ($doc_dir, "doc.xml");  
      
-  $self->sort_metadata($doc_obj);
+  $self->store_output_info_reference($doc_obj);
 }
 

trunk/gsdl/perllib/plugouts/METSPlugout.pm

@@ -154 +154 @@
     $self->{'short_doc_file'} =  &util::filename_cat ($doc_dir, "docmets.xml");
   
-    $self->sort_metadata($doc_obj);
+    $self->store_output_info_reference($doc_obj);
       
 }