Changeset 9465 for trunk/gsdl

Timestamp:

2005-03-18T14:10:58+13:00 (19 years ago)

Author:

kjdon

Message:

ConvertToPlug now accepts the gli arg in read() and passes it in process(), and all the convert plugins now print a processing message for gli in their process() method.

Location:

trunk/gsdl/perllib/plugins

Files:

• ConvertToPlug.pm (modified) (2 diffs)
• ExcelPlug.pm (modified) (1 diff)
• PDFPlug.pm (modified) (3 diffs)
• PPTPlug.pm (modified) (1 diff)
• PSPlug.pm (modified) (1 diff)
• RTFPlug.pm (modified) (1 diff)
• WordPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -267 +267 @@
 sub read {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs) = @_;
+    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $gli) = @_;
 #    if ($self->is_recursive()) {
 #        die "BasPlug::read function must be implemented in sub-class for recursive plugins\n";
@@ -337 +337 @@
     $self->extra_metadata ($doc_obj, $doc_obj->get_top_section(), $metadata);
     # do plugin specific processing of doc_obj
-    return -1 unless defined ($self->process (\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj));
+    return -1 unless defined ($self->process (\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli ));
     # do any automatic metadata extraction
     $self->auto_extract_metadata ($doc_obj);

trunk/gsdl/perllib/plugins/ExcelPlug.pm

@@ -78 +78 @@
     print $outhandle "ExcelPlug: passing $_[3] on to $self->{'converted_to'}Plug\n"
     if $self->{'verbosity'} > 1;
+    print STDERR "<Processing n='$_[3]' p='ExcelPlug'>\n" if ($_[6]);
 
     return ConvertToPlug::process_type($self,"xls",@_);

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -140 +140 @@
 sub process {
     my $self = shift (@_);
+    #my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
+
     my $outhandle=$self->{'outhandle'};
 
@@ -208 +210 @@
     print $outhandle "PDFPlug: passing $_[3] on to $self->{'converted_to'}Plug\n"
     if $self->{'verbosity'} > 1;
+    print STDERR "<Processing n='$_[3]' p='PDFPlug'>\n" if ($_[6]);
 
     # tell htmlplug to extract these metadata fields from the HEAD META fields
@@ -214 +217 @@
     my $result = ConvertToPlug::process_type($self,"pdf",@_);
 
-    my $doc_obj = pop(@_);
-
+    #my $doc_obj = pop(@_);
+    my $doc_obj = $_[5];
     # fix up the extracted date metadata to be in Greenstone date format,
     # and fix the capitalisation of 'date'

trunk/gsdl/perllib/plugins/PPTPlug.pm

@@ -76 +76 @@
     print $outhandle "PPTPlug: passing $_[3] on to $self->{'converted_to'}Plug\n"
     if $self->{'verbosity'} > 1;
+    print STDERR "<Processing n='$_[3]' p='PPTPlug'>\n" if ($_[6]);
 
     return ConvertToPlug::process_type($self,"ppt",@_);

trunk/gsdl/perllib/plugins/PSPlug.pm

@@ -169 +169 @@
 sub process {
     my $self = shift (@_);
-    my ($trash, $trash2, $path, $file, $trash3, $doc) = @_;
+    my ($trash, $trash2, $path, $file, $trash3, $doc, $gli) = @_;
 
     my $outhandle = $self->{'outhandle'};
     print $outhandle "PSPlug: passing $_[3] on to $self->{'converted_to'}Plug\n" 
     if $self->{'verbosity'} > 1;
-    
+    print STDERR "<Processing n='$_[3]' p='PDFPlug'>\n" if ($gli);
+
     &extract_metadata_from_postscript($self,"$path/$file", $doc);
 

trunk/gsdl/perllib/plugins/RTFPlug.pm

@@ -70 +70 @@
     print $outhandle "RTFPlug: passing $_[3] on to $self->{'converted_to'}Plug\n" 
     if $self->{'verbosity'} > 1;
+    print STDERR "<Processing n='$_[3]' p='RTFPlug'>\n" if ($_[6]);
 
     return ConvertToPlug::process_type($self,"rtf",@_);

trunk/gsdl/perllib/plugins/WordPlug.pm

@@ -74 +74 @@
 sub process {
     my $self = shift (@_);
+    #my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
 
-    my $outhandle = $self->{'outhandle'};    
+    my $outhandle = $self->{'outhandle'}; 
     print $outhandle "WordPlug: passing $_[3] on to $self->{'converted_to'}Plug\n" 
     if $self->{'verbosity'} > 1;
-    
+    print STDERR "<Processing n='$_[3]' p='WordPlug'>\n" if ($_[6]);
+
     return ConvertToPlug::process_type($self,"doc",@_);
 }