Changeset 16104

Timestamp:

2008-06-23T12:13:46+12:00 (16 years ago)

Author:

kjdon

Message:

tried to make the 'xxxplugin processing file' print statements more consistent. They are now done in read (or read_into_doc_obj) and not process

Location:

gsdl/trunk/perllib/plugins

Files:

• BibTexPlugin.pm (modified) (1 diff)
• CSVPlugin.pm (modified) (1 diff)
• DBPlugin.pm (modified) (1 diff)
• EmailPlugin.pm (modified) (1 diff)
• FavouritesPlugin.pm (modified) (1 diff)
• HTMLPlugin.pm (modified) (1 diff)
• ISISPlugin.pm (modified) (1 diff)
• LaTeXPlugin.pm (modified) (1 diff)
• MARCPlugin.pm (modified) (1 diff)
• MediaWikiPlugin.pm (modified) (1 diff)
• OpenDocumentPlugin.pm (modified) (1 diff)
• ProCitePlugin.pm (modified) (1 diff)
• ReferPlugin.pm (modified) (2 diffs)
• SourceCodePlugin.pm (modified) (1 diff)
• SplitTextFile.pm (modified) (2 diffs)
• StructuredHTMLPlugin.pm (modified) (1 diff)
• TextPlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/BibTexPlugin.pm

@@ -114 +114 @@
     # Ignore things we can't use
     return 0 if ($$textref =~ /^\@String/);
-
-    # Report that we're processing the file
-    print STDERR "<Processing n='$file' p='BibTexPlugin'>\n" if ($gli);
-    print $outhandle "BibTexPlugin: processing $file\n"
-    if ($self->{'verbosity'}) > 1;
-
 
     # This hash translates BibTex field names into metadata names.  The

gsdl/trunk/perllib/plugins/CSVPlugin.pm

@@ -143 +143 @@
     my @csv_file_fields = @{$self->{'csv_file_fields'}};
 
-    # Report that we're processing the file
-    print STDERR "\n<Processing n='$file' p='CSVPlugin'>\n" if ($gli);
-    print $outhandle "CSVPlugin: processing $file\n" if ($self->{'verbosity'}) > 1;
-
     # Add the raw line as the document text
     $doc_obj->add_utf8_text($section, $csv_line);

gsdl/trunk/perllib/plugins/DBPlugin.pm

@@ -89 +89 @@
     my $verbosity = $self->{'verbosity'};
 
+    print STDERR "<Processing n='$file' p='DBPlugin'>\n" if ($gli);
     print $outhandle "DBPlugin: processing $file\n" 
     if $self->{'verbosity'} > 1;

gsdl/trunk/perllib/plugins/EmailPlugin.pm

@@ -164 +164 @@
     return undef;
     }
-
-
-    print STDERR "<Processing n='$file' p='EmailPlugin'>\n" if ($gli);
-
-    gsprintf($outhandle, "EmailPlugin: {common.processing} $file\n")
-    if $self->{'verbosity'} > 1;
 
     my $cursection = $doc_obj->get_top_section();

gsdl/trunk/perllib/plugins/FavouritesPlugin.pm

@@ -80 +80 @@
 
     my $section = $doc_obj->get_top_section();
-    print STDERR "<Processing n='$file' p='FavouritesPlugin'>\n" if ($gli);
-    print $outhandle "FavouritesPlugin: processing $file\n" if $self->{'verbosity'} > 1;
 
     # don't want mg to turn escape chars into actual values

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -616 +616 @@
     my $outhandle = $self->{'outhandle'};
 
-    print STDERR "<Processing n='$file' p='HTMLPlugin'>\n" if ($gli);
-
-    print $outhandle "HTMLPlugin: processing $file\n"
-    if $self->{'verbosity'} > 1;
-
     if ($ENV{'GSDLOS'} =~ /^windows/i) {
     # this makes life so much easier... perl can cope with unix-style '/'s.

gsdl/trunk/perllib/plugins/ISISPlugin.pm

@@ -185 +185 @@
     my $isis_record_html_metadata_value = "<table cellpadding=\"4\" cellspacing=\"0\">";
 
-    # Report that we're processing the file
-    print STDERR "\n<Processing n='$file' p='ISISPlugin'>\n" if ($gli);
-    print $outhandle "IsisPlug: processing $file\n" if ($self->{'verbosity'}) > 1;
-
     # Process each line of the ISIS record, one at a time
     foreach my $line (split(/\n/, $$textref)) {

gsdl/trunk/perllib/plugins/LaTeXPlugin.pm

@@ -94 +94 @@
     }
     my $outhandle = $self->{'outhandle'};
-    if ($gli) {
-    print STDERR "<Processing n='$file' p='LaTeXPlugin'>\n";
-    } elsif ($self->{'verbosity'} > 1) {
-    print $outhandle "LaTeXPlugin: processing $file\n" 
-    }
+
     my $cursection = $doc_obj->get_top_section();
 

gsdl/trunk/perllib/plugins/MARCPlugin.pm

@@ -272 +272 @@
     }
 
-    print STDERR "<Processing n='$file' p='MARCPlugin'>\n" if ($gli);
-    print $outhandle "MARCPlugin: processing $file\n"
-    if $self->{'verbosity'} > 1;
-
     my $cursection = $doc_obj->get_top_section();
 

gsdl/trunk/perllib/plugins/MediaWikiPlugin.pm

@@ -121 +121 @@
     my $outhandle = $self->{'outhandle'};
 
-    print $outhandle "MediaWikiPlugin: processing $file\n" if $self->{'verbosity'} > 1;
-          
     my @head_and_body = split(/<body/i,$$textref);
     my $head = shift(@head_and_body);

gsdl/trunk/perllib/plugins/OpenDocumentPlugin.pm

@@ -167 +167 @@
     return $block_status if ((!defined $block_status) || ($block_status==0));
 
+    # Report that we're processing the file
+    print STDERR "<Processing n='$file' p='OpenDocumentPlugin'>\n" if ($gli);
+    print $outhandle "OpenDocumentPlugin: processing $file\n"
+    if ($self->{'verbosity'}) > 1;
+
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
     $self->{'file'} = $file;

gsdl/trunk/perllib/plugins/ProCitePlugin.pm

@@ -160 +160 @@
     my $filename = &util::filename_cat($base_dir, $file);
     my $cursection = $doc_obj->get_top_section();
-    # Report that we're processing the file
-    print STDERR "<Processing n='$file' p='ProCitePlugin'>\n" if ($gli);
-    print $outhandle "ProCitePlugin: processing $file\n"
-    if ($self->{'verbosity'}) > 1;
 
     # Build up an HTML view of the record for easy display at run-time

gsdl/trunk/perllib/plugins/ReferPlugin.pm

@@ -115 +115 @@
 }
 
-# The process function reads a single bibliogrphic record and stores
+# The process function reads a single bibliographic record and stores
 # it as a new document.
 
@@ -127 +127 @@
 
     my $cursection = $doc_obj->get_top_section();
-    # Report that we're processing the file
-    print STDERR "<Processing n='$file' p='ReferPlugin'>\n" if ($gli);
-    print $outhandle "ReferPlugin: processing $file\n"
-    if ($self->{'verbosity'}) > 1;
 
     my %field = ('H', 'Header',

gsdl/trunk/perllib/plugins/SourceCodePlugin.pm

@@ -104 +104 @@
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
     my $outhandle = $self->{'outhandle'};
-    
-    print STDERR "<Processing n='$file' p='SourceCodePlugin'>\n" if ($gli);
-    print $outhandle "SourceCodePlugin: processing $file\n" 
-    if $self->{'verbosity'} > 1;
     
     my $cursection = $doc_obj->get_top_section();

gsdl/trunk/perllib/plugins/SplitTextFile.pm

@@ -207 +207 @@
     return 0; # not processed but no point in passing it on
     }
+
+    print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
+    print $outhandle "$self->{'plugin_type'} processing $file\n"
+        if $self->{'verbosity'} > 1;    
 
     my $language = $le_rec->{'language'};
@@ -252 +256 @@
 
     # do plugin specific processing of doc_obj
-    print $outhandle "segment $segment - " if ($self->{'verbosity'});
+    print $outhandle "segment $segment\n" if ($self->{'verbosity'});
     $status = $self->process (\$segtext, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli);
     if (!defined $status) {

gsdl/trunk/perllib/plugins/StructuredHTMLPlugin.pm

@@ -102 +102 @@
     my $outhandle = $self->{'outhandle'};
 
-    print $outhandle "StructuredHTMLPlugin: processing $file\n"
-        if $self->{'verbosity'} > 1;
-    
     my @head_and_body = split(/<body/i,$$textref);
     my $head = shift(@head_and_body);

gsdl/trunk/perllib/plugins/TextPlugin.pm

@@ -85 +85 @@
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
     my $outhandle = $self->{'outhandle'};
-
-    print STDERR "<Processing n='$file' p='TextPlugin'>\n" if ($gli);
-    print $outhandle "TextPlugin xx: processing $file\n" 
-    if $self->{'verbosity'} > 1;
     
     my $cursection = $doc_obj->get_top_section();