Changeset 38251 for main/trunk/greenstone2

Timestamp:

2023-09-28T16:45:16+13:00 (8 months ago)

Author:

anupama

Message:

Still on removing user comments and the remove-metadata-array methods: 1. Sorting the metapositions array in the crucial *descending* order now is done in the perl remove-metadata-array functions, where it should have been done in the first place, so callers don't need to know to do this. 2. Delete user comments button wasn't getting disabled, because I was not using the right JavaScript ID to select it.

File:

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

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

@@ -3401 +3401 @@
         my $metapositions = $metatable_rec->{'metapositions'} || undef; # a sub-subarray
         if(defined $metapositions) {
+            
             my $metavalue = undef;
+            # Need to have metapositions sorted in *descending* order for
+            # remove_metadata_array to work. Start deleting from end of metadata list,
+            # so we don't have to recalculate metapos after each delete at a metapos
+            @$metapositions = reverse(sort(@$metapositions)); # https://perldoc.perl.org/functions/reverse
             
             foreach my $metapos ( @$metapositions ) { # metapositions is an array
@@ -3630 +3635 @@
     my $site = $self->{'site'};
     my $collect_dir = $gsdl_cgi->get_collection_dir($site);
-    
+    
     # look up additional args
     
@@ -3643 +3648 @@
     my $global_status = 0;
     my $global_mess = "";
+
+#    $gsdl_cgi->generate_error("*** Deliberately causing error to test errorResponse function\n");
     
     my @all_docids = ();
@@ -3682 +3689 @@
         my $metapositions = $metatable_rec->{'metapositions'}; # a sub-subarray
         if(defined $metapositions) {
-            foreach my $metapos ( @$metapositions ) {           
-            my $metavalue = undef;
+            
+            my $metavalue = undef;
+            
+            # need metapositions sorted in *descending* order
+            @$metapositions = reverse(sort(@$metapositions));
+            
+            foreach my $metapos ( @$metapositions ) {
             
             $metadata_xml_filename = $self->remove_import_metadata_entry($gsdl_cgi, $arcinfo_doc_filename, $infodbtype, $docid_root, $metaname, $metapos, $metavalue, $metamode); # at this point, docid_root = docid
@@ -3779 +3791 @@
         $metaname  = $metatable_rec->{'metaname'};
         my $metamode  = $metatable_rec->{'metamode'} || $doc_array_rec->{'metamode'} || $self->{'metamode'};
+        
         my $metapositions = $metatable_rec->{'metapositions'}; # a sub-subarray
         if(defined $metapositions) {
-            foreach my $metapos ( @$metapositions ) {           
-            my $metavalue = undef;
+            
+            my $metavalue = undef;
+            
+            # need metapositions sorted in *descending* order
+            @$metapositions = reverse(sort(@$metapositions));
+            
+            foreach my $metapos ( @$metapositions ) {
             
             $status = $self->remove_archives_metadata_entry($gsdl_cgi, $archive_dir, $infodbtype,