Changeset 38191 for main/trunk/greenstone2

Timestamp:

2023-09-23T18:46:28+12:00 (9 months ago)

Author:

anupama

Message:

Moving the cleaning of parameters into more atomic function set-index-metadata-entry, so it's always executed. It doesn't hurt to always do it, and will ensure more consistent results when the subroutine is called directly as it sometimes is from other functions. Committing changes ahead of my work adding remove-metadata-array subroutines.

File:

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

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

@@ -243 +243 @@
     my $self = shift @_;
     my ($collect_dir,$collect,$infodbtype,$docid,$metaname,$metapos,$metavalue,$metamode,$prevmetavalue) = @_;
+
+    $metapos = undef if(defined $metapos && ($metapos =~ m/^\s*$/));
+    $prevmetavalue = undef if(defined $prevmetavalue && ($prevmetavalue =~ m/^\s*$/));
     
     # To people who know $collect_tail please add some comments
@@ -457 +460 @@
     my $metamode  = $self->{'metamode'};
     my $prevmetavalue = $self->{'prevmetavalue'};
-
-    $metapos = undef if(defined $metapos && ($metapos =~ m/^\s*$/));
-    $prevmetavalue = undef if(defined $prevmetavalue && ($prevmetavalue =~ m/^\s*$/));
 
     print STDERR "SETTING INDEX METADATA ENTRY\n";