Changeset 24949 for main/trunk

Timestamp:

2012-01-16T15:12:39+13:00 (12 years ago)

Author:

sjm84

Message:

Adding the ability to specify metadata values to use to remove archive and index metadata. The code is untested at this point.

File:

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

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

@@ -80 +80 @@
                      
     "remove-archives-metadata" => { 'compulsory-args' => [ "d", "metaname" ], #TODO: add f argument
-                     'optional-args'   => [ "metapos" ] },
+                     'optional-args'   => [ "metapos", "metavalue" ] },
 
     "remove-live-metadata"  => { 'compulsory-args' => [ "d", "metaname" ],
@@ -86 +86 @@
 
     "remove-metadata"       => { 'compulsory-args' => [ "d", "metaname" ],
-                     'optional-args'   => [ "metapos" ] },
+                     'optional-args'   => [ "metapos", "metavalue" ] },
 
     "insert-metadata"       => { 'compulsory-args' => [ "d", "metaname", "metavalue" ],
@@ -878 +878 @@
     my $import_filename = $doc_rec->{'doc-file'}->[0];  
 
-    my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $import_filename), $metaname, $metapos, $docid_secnum);
+    my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $import_filename), $metaname, $metapos, null, $docid_secnum);
     
     # Release the lock once it is done
@@ -905 +905 @@
 {
     my $self = shift @_;
-    my ($gsdl_cgi, $doc_xml_filename, $metaname, $metapos, $secid) = @_;
+    my ($gsdl_cgi, $doc_xml_filename, $metaname, $metapos, $metavalue, $secid) = @_;
     
     my @start_rules = ('Section' => \&dxml_start_section);
@@ -950 +950 @@
         else {
             binmode($MOUT,":utf8");
-            $parser->filter($xml_in, $MOUT, {metaname => $metaname, metapos => $metapos, secid => $secid});
+            $parser->filter($xml_in, $MOUT, {metaname => $metaname, metapos => $metapos, metavalue => $metavalue, secid => $secid});
             close($MOUT);       
         }
@@ -980 +980 @@
     
     if ((defined $parser->{'parameters'}->{'metapos'}) && ($parser->{'parameters'}->{'metaname'} eq $attrHash->{'name'}) && ($parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}))
+    {   
+        return [];
+    }
+    
+    if ((defined $parser->{'parameters'}->{'metavalue'}) && ($parser->{'parameters'}->{'metaname'} eq $attrHash->{'name'}) && ($parser->{'parameters'}->{'metavalue'} eq $attrHash->{'_content'}))
     {   
         return [];
@@ -1519 +1524 @@
     my $metaname  = $self->{'metaname'};
     my $metapos   = $self->{'metapos'};
+    my $metavalue = $self->{'metavalue'};
 
     # To people who know $collect_tail please add some comments
@@ -1561 +1567 @@
     my $num_metadata_vals = scalar(@{$doc_rec->{$metaname}});    
     for (my $i=0; $i<$num_metadata_vals; $i++) {
-    my $metavalue = shift(@{$doc_rec->{$metaname}});
-
-    if ($i != $metapos) {
-        push(@$filtered_metadata,$metavalue)
+    my $metaval = shift(@{$doc_rec->{$metaname}});
+
+    if (!defined $metavalue && $i != $metapos) {
+        push(@$filtered_metadata,$metaval)
+    }
+    
+    if(defined $metavalue && !($metavalue eq $metaval))
+    {
+        push(@$filtered_metadata,$metavalue)
     }
     }