Changeset 22709

Timestamp:

2010-08-23T00:27:23+12:00 (14 years ago)

Author:

davidb

Message:

Fixed up -process_exp so it now dynamically configures itself properly, based on whether OpenOfficeConverter is found or not

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• ExcelPlugin.pm (modified) (4 diffs)
• PowerPointPlugin.pm (modified) (4 diffs)
• WordPlugin.pm (modified) (3 diffs)

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

@@ -2 +2 @@
 #
 # ExcelPlugin.pm -- plugin for importing Microsoft Excel files.
-#  (currently only versions 95 and 97)
+#  (basic version supports versions 95 and 97)
+#  (through OpenOffice extension, supports all contempoary formats)
 #
 # A component of the Greenstone digital library software
@@ -43 +44 @@
     'type' => "regexp",
     'reqd' => "no",
-    'deft' => &get_default_process_exp() }
+    'deft' => "&get_default_process_exp(\$self)"  # delayed (see below)
+    }
       ];
 
@@ -61 +63 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new AutoloadConverterScripting("OpenOfficeConverter",$pluginlist, $inputargs, $hashArgOptLists);
+    my $self 
+    = new AutoloadConverterScripting("OpenOfficeConverter",$pluginlist, 
+                     $inputargs, $hashArgOptLists);
+
+    # plugin's process_exp can only be correctly determined once autoloading
+    # has taken place
+    my $plug_options = $self->{'option_list'}->[0];
+    my $plug_args = $plug_options->{'args'};
+    
+    foreach my $a (@$plug_args) {
+    # consider changing this to search for all values that are
+    # tagged as 'deft-delayed' = 1 ?!?
+
+    if ($a->{'name'} eq "process_exp") {
+        my $eval_expr = $a->{'deft'};
+        $a->{'deft'} = eval "$eval_expr";
+
+        # Now see if process_exp needs updating
+        my $process_exp = $self->{'process_exp'};
+        if (!$self->{'info_only'} && ($process_exp eq $eval_expr)) {
+        # process_exp is only defined if not 'info_only'
+        #
+        # if it does exist and it equals the unevaluated $eval_expr
+        # then it was set to the default (rather than overriden by
+        # the collect.cfg file)
+
+        $self->{'process_exp'} = $a->{'deft'};
+        }
+    }
+    }
     
     if ($self->{'info_only'}) {
@@ -124 +155 @@
 sub get_default_process_exp {
     my $self = shift (@_);
+
+    if ($self->{'scripting_ext_working'}) {
+    return q^(?i)\.(xls|xlsx|ods)$^;
+    }
+
     return q^(?i)\.xls$^;
 }

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

@@ -2 +2 @@
 #
 # PowerPointPlugin.pm -- plugin for importing Microsoft PowerPoint files.
-#  (currently only versions 95 and 97)
+#  (basic version supports versions 95 and 97)
+#  (through OpenOffice extension, supports all contempoary formats)
 #
 # A component of the Greenstone digital library software
@@ -59 +60 @@
     'type' => "regexp",
     'reqd' => "no",
-    'deft' => &get_default_process_exp()}
+    'deft' => "&get_default_process_exp(\$self)",  # delayed (see below)
+    }
       ];
 
@@ -99 +101 @@
                      $pluginlist, $inputargs, 
                      $hashArgOptLists);
+
+
+    # plugin's process_exp can only be correctly determined once autoloading
+    # has taken place
+    my $plug_options = $self->{'option_list'}->[0];
+    my $plug_args = $plug_options->{'args'};
+    
+    foreach my $a (@$plug_args) {
+    # consider changing this to search for all values that are
+    # tagged as 'deft-delayed' = 1 ?!?
+
+    if ($a->{'name'} eq "process_exp") {
+        my $eval_expr = $a->{'deft'};
+        $a->{'deft'} = eval "$eval_expr";
+
+        # Now see if process_exp needs updating
+        my $process_exp = $self->{'process_exp'};
+        if (!$self->{'info_only'} && ($process_exp eq $eval_expr)) {
+        # process_exp is only defined if not 'info_only'
+        #
+        # if it does exist and it equals the unevaluated $eval_expr
+        # then it was set to the default (rather than overriden by
+        # the collect.cfg file)
+
+        $self->{'process_exp'} = $a->{'deft'};
+        }
+    }
+    }
+
  
     if ($self->{'info_only'}) {
@@ -161 +192 @@
 sub get_default_process_exp {
     my $self = shift (@_);
+
+    if ($self->{'scripting_ext_working'}) {
+    return q^(?i)\.(ppt|pptx|odp)$^;
+    }
+
     return q^(?i)\.ppt$^;
 }

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

@@ -40 +40 @@
     'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
-    'deft' => &get_default_process_exp(),
+    'deft' => "&get_default_process_exp(\$self)",  # delayed (see below)
     'reqd' => "no" },
       { 'name' => "description_tags",
@@ -116 +116 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $self = new AutoloadConverterScripting("OpenOfficeConverter",$pluginlist, $inputargs, $hashArgOptLists);
+    my $self 
+    = new AutoloadConverterScripting("OpenOfficeConverter",$pluginlist, 
+                     $inputargs, $hashArgOptLists);
+
+    # plugin's process_exp can only be correctly determined once autoloading
+    # has taken place
+    my $plug_options = $self->{'option_list'}->[0];
+    my $plug_args = $plug_options->{'args'};
+    
+    foreach my $a (@$plug_args) {
+    # consider changing this to search for all values that are
+    # tagged as 'deft-delayed' = 1 ?!?
+
+    if ($a->{'name'} eq "process_exp") {
+        my $eval_expr = $a->{'deft'};
+        $a->{'deft'} = eval "$eval_expr";
+
+        # Now see if process_exp needs updating
+        my $process_exp = $self->{'process_exp'};
+        if (!$self->{'info_only'} && ($process_exp eq $eval_expr)) {
+        # process_exp is only defined if not 'info_only'
+        #
+        # if it does exist and it equals the unevaluated $eval_expr
+        # then it was set to the default (rather than overriden by
+        # the collect.cfg file)
+
+        $self->{'process_exp'} = $a->{'deft'};
+        }
+    }
+    }
+
 
     if ($self->{'info_only'}) {
@@ -209 +239 @@
 sub get_default_process_exp {
     my $self = shift (@_);
-    if ($AutoloadConverterScripting::openoffice_ext_working) {
+    if ($self->{'scripting_ext_working'}) {
     return q^(?i)\.(doc|dot|docx|odt)$^;
     }