Changeset 31742

Timestamp:

2017-06-19T17:14:28+12:00 (7 years ago)

Author:

ak19

Message:

No need to hardcode the plugin name

File:

• main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm (modified) (2 diffs)

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

@@ -406 +406 @@
     = &File::Basename::fileparse($input_filename, "\\.[^\\.]+\$");
 
+    my $plugin_name = $self->{'plugin_type'};
+
     # find all the files in the directory
     if (!opendir (DIR, $dirname)) {
-    print $outhandle "PowerPointPlugin: Couldn't read directory $dirname\n";
+    print $outhandle "$plugin_name: Couldn't read directory $dirname\n";
     return $input_filename;
     }
@@ -420 +422 @@
     # encoding specification????
     if (!open (ITEMFILE, ">$itemfile_name")) {
-    print $outhandle "PowerPOintPlugin: Couldn't open $itemfile_name for writing\n";
-    }
-    print ITEMFILE "<GeneratedBy>PowerPointPlugin\n";
+    print $outhandle "$plugin_name: Couldn't open $itemfile_name for writing\n";
+    }
+    print ITEMFILE "<GeneratedBy>$plugin_name\n";
     # print the first page
     my @sorted_dir = sort alphanum_sort @dir;