Changeset 38233

Timestamp:

2023-09-26T21:35:04+13:00 (8 months ago)

Author:

anupama

Message:

1. remove_index_metadata_array needed to process the metadatapositions array in metatable. 2. dbinfo should deal with questionmark-exclamation mark not many outer calls later, by which time that variable has been reset. 3. Another location where needs to be set from return value.

File:

• main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm (modified) (6 diffs)

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

@@ -1666 +1666 @@
             binmode($MOUT,":utf8");
             $parser->filter($xml_in, $MOUT, {metaname => $metaname, metapos => $metapos, metavalue => $metavalue, secid => $secid, metamode => $metamode});
-            close($MOUT);       
+            close($MOUT);
         }
     }
@@ -2666 +2666 @@
 
     ## Use the dbutil set_entry method instead of assuming the database is gdbm
-    my $status = &dbutil::set_infodb_entry($infodbtype, $infodb_file_path, $docid, $doc_rec);
-
+    my $status = &dbutil::set_infodb_entry($infodbtype, $infodb_file_path, $docid, $doc_rec);    
     return $status;
 }
@@ -3396 +3395 @@
         $metaname  = $metatable_rec->{'metaname'};
         #my $metamode  = $metatable_rec->{'metamode'} || $doc_array_rec->{'metamode'} || $self->{'metamode'}; # metamode not used by remove_index_metadata
-        my $metapos = $metatable_rec->{'metapos'} || $doc_array_rec->{'metapos'} || $self->{'metapos'} || undef; # try most-to-least specific metapos setting, and fallback on undef
-        my $metavals = $metatable_rec->{'metavals'}; # a sub-subarray
-
-        foreach my $metavalue ( @$metavals ) { # metavals is an array
-            $status = $self->remove_index_metadata_entry($collect_dir,$collect,$infodbtype,$docid,$metaname,$metapos,$metavalue); # how do we use metamode in set_meta_entry?
+        
+        #my $metapos = $metatable_rec->{'metapositions'} || $doc_array_rec->{'metapos'} || $self->{'metapos'} || undef; # try most-to-least specific metapos setting, and fallback on undef
+
+
+        my $metapositions = $metatable_rec->{'metapositions'} || undef; # a sub-subarray
+        if(defined $metapositions) {
+            my $metavalue = undef;
             
-        }           
+            foreach my $metapos ( @$metapositions ) { # metapositions is an array
+            $status = $self->remove_index_metadata_entry($collect_dir,$collect,$infodbtype,$docid,$metaname,$metapos,$metavalue); # how do we use metamode in set_meta_entry?
+            
+           } 
+        } else {            
+            my $metavals = $metatable_rec->{'metavals'}; # a sub-subarray
+            next unless defined $metavals;
+            my $metapos = undef;
+            
+            foreach my $metavalue ( @$metavals ) { # metavals is an array
+            $status = $self->remove_index_metadata_entry($collect_dir,$collect,$infodbtype,$docid,$metaname,$metapos,$metavalue); # how do we use metamode in set_meta_entry?   
+            }
+        }
         }
     }
@@ -3409 +3422 @@
         # Catch error if set infodb entry failed
         $global_status = $status;
-        $global_mess .= "Failed to remove metadata key: $docid\n";
+        $global_mess .= "Failed to remove metadata key from index: $docid\n";
         $global_mess .= "Exit status: $status\n";
-        $global_mess .= "System Error Message: $!\n";
+        # Need to check the error message $! immediately after an IO call goes wrong
+        # not after returning from many nested calls
+        # https://stackoverflow.com/questions/1605195/inappropriate-ioctl-for-device
+        # $global_mess .= "System Error Message: $!\n";
         $global_mess .= "-" x 20;
     }
@@ -3456 +3472 @@
 }
 
-# Untested, based on also untested experimental _set_live_metadata_array
+# Untested, based on also (probably) untested, experimental _set_live_metadata_array
 # TODO: How can we delete at a dbkey with a particular value or at a particular metapos?
 # Same question for sub remove_live_metadata
@@ -3768 +3784 @@
             my $metavalue = undef;
             
-            $self->remove_archives_metadata_entry($gsdl_cgi, $archive_dir, $infodbtype,
+            $status = $self->remove_archives_metadata_entry($gsdl_cgi, $archive_dir, $infodbtype,
                   $docid,$docid_secnum,$dv, $metaname,$metapos,$metavalue,$metamode);