Changeset 34997

Timestamp:

2021-04-04T15:23:36+12:00 (3 years ago)

Author:

davidb

Message:

When working with orthogonal indexes, these plugins constructors get called a second time; however the way the eval expression was written resulted in an error. Change is to test to see if the eval_expr is still in the form of '&...' and if it is, let the eval go ahead. Otherwise (i.e. second time in constructor) it has already been evaluated and restored under the 'deft' name, in which case no futher work needs to be done

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• ExcelPlugin.pm (modified) (1 diff)
• PowerPointPlugin.pm (modified) (1 diff)
• WordPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm

@@ -80 +80 @@
     if ($a->{'name'} eq "process_exp") {
         my $eval_expr = $a->{'deft'};
-        $a->{'deft'} = eval "$eval_expr";
+        if ($eval_expr =~ m/^&/) {
+        $a->{'deft'} = eval "$eval_expr";
+        }
         last;
     }

main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm

@@ -146 +146 @@
     if ($a->{'name'} eq "process_exp") {
         my $eval_expr = $a->{'deft'};
-        $a->{'deft'} = eval "$eval_expr";
+        if ($eval_expr =~ m/^&/) {
+        $a->{'deft'} = eval "$eval_expr";
+        }
         last;
     }

main/trunk/greenstone2/perllib/plugins/WordPlugin.pm

@@ -133 +133 @@
     if ($a->{'name'} eq "process_exp") {
         my $eval_expr = $a->{'deft'};
-        $a->{'deft'} = eval "$eval_expr";
+        if ($eval_expr =~ m/^&/) {
+        $a->{'deft'} = eval "$eval_expr";
+        }
         last;
     }