Changeset 10254


Ignore:
Timestamp:
2005-07-19T16:27:51+12:00 (19 years ago)
Author:
kjdon
Message:

added 'use strict' to all plugins, and made modifications (mostly adding 'my') to make them compile

Location:
trunk/gsdl/perllib/plugins
Files:
44 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/perllib/plugins/ArcPlug.pm

    r10218 r10254  
    3838use gsprintf;
    3939
     40use strict;
     41no strict 'refs'; # allow filehandles to be variables and viceversa
     42
    4043BEGIN {
    4144    @ArcPlug::ISA = ('BasPlug');
    4245}
     46
     47my $arguments = [
     48         ];
    4349
    4450my $options = { 'name'     => "ArcPlug",
    … …  
    4652        'abstract' => "no",
    4753        'inherits' => "yes" };
    48 
     54         
    4955sub gsprintf
    5056{
    … …  
    5763    push(@$pluginlist, $class);
    5864
    59     if(defined $arguments){print "SETSEGE\n"; push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
     65    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    6066    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
    6167
    … …  
    7985    foreach my $subfile (@$file_list) {
    8086        my $doc_oid = $subfile->[1];
    81         $index_status = $archive_info->get_status_info($doc_oid);
     87        # why do we get this when it is not used???
     88        my $index_status = $archive_info->get_status_info($doc_oid);
    8289        $archive_info->set_status_info($doc_oid,"B");
    8390    }
    … …  
    133140        my $doc_oid = $subfile->[1];
    134141
    135         $index_status = $archive_info->get_status_info($doc_oid);
     142        my $index_status = $archive_info->get_status_info($doc_oid);
    136143
    137144        my $processor_mode = $processor->get_mode();       

  • trunk/gsdl/perllib/plugins/BNContentePlug.pm

    r10218 r10254  
    3737use XMLParser;
    3838use XML::Parser;
     39
     40use strict;
     41no strict 'refs'; # allow filehandles to be variables and viceversa
    3942
    4043sub BEGIN {

  • trunk/gsdl/perllib/plugins/BasPlug.pm

    r10229 r10254  
    3636$SIG{__WARN__} = sub {warn($_[0]) unless ($_[0] =~ /Subroutine\s+\S+\sredefined/)};
    3737
    38 use strict; no strict 'subs';
     38use strict;
     39no strict 'subs';
     40no strict 'refs'; # allow filehandles to be variables and viceversa
    3941
    4042use File::Basename;

  • trunk/gsdl/perllib/plugins/BibTexPlug.pm

    r10218 r10254  
    4545
    4646use SplitPlug;
     47use strict;
     48no strict 'refs'; # allow filehandles to be variables and viceversa
    4749
    4850# BibTexPlug is a sub-class of BasPlug.
    4951sub BEGIN {
    50     @ISA = ('SplitPlug');
     52    @BibTexPlug::ISA = ('SplitPlug');
    5153}
    5254
    … …  
    103105    my $outhandle = $self->{'outhandle'};
    104106
     107    my $cursection = $doc_obj->get_top_section();
    105108    $self->{'key'} = "default";
    106109

  • trunk/gsdl/perllib/plugins/BookPlug.pm

    r10218 r10254  
    5555use BasPlug;
    5656use util;
     57use strict;
     58no strict 'refs'; # allow filehandles to be variables and viceversa
    5759
    5860sub BEGIN {
    59     @ISA = ('BasPlug');
     61    @BookPlug::ISA = ('BasPlug');
    6062}
    6163
    … …  
    197199
    198200sub replace_image_links {
     201    my $self = shift (@_);
    199202    my ($dir, $doc_obj, $front, $link, $back) = @_;
    200203    my $outhandle = $self->{'outhandle'};

  • trunk/gsdl/perllib/plugins/ConvertToPlug.pm

    r10218 r10254  
    4343use ghtml;
    4444
     45use strict;
     46no strict 'refs'; # allow filehandles to be variables and viceversa
     47
    4548sub BEGIN {
    46     @ISA = ('HTMLPlug');
     49    @ConvertToPlug::ISA = ('HTMLPlug');
    4750#    @ISA = ('HTMLPlug', 'TEXTPlug');
    4851#    @ISA = ('BasPlug'); #, 'HTMLPlug', 'TEXTPlug');

  • trunk/gsdl/perllib/plugins/ConvertToRogPlug.pm

    r10218 r10254  
    3030use BasPlug;
    3131use RogPlug;
    32 
     32use strict;
     33no strict 'refs'; # allow filehandles to be variables and viceversa
    3334
    3435sub BEGIN {
    35     @ISA = ('RogPlug');
    36 }
    37 
     36    @ConvertToRogPlug::ISA = ('RogPlug');
     37}
     38
     39my $arguments = [
     40         ];
    3841my $options = { 'name'     => "ConvertToRogPlug",
    3942        'desc'     => "{ConvertToRogPlug.desc}",
    4043        'abstract' => "yes",
    4144        'inherits' => "yes" };
    42 
    43 
    44 sub parse_args
    45 {
    46     my $class = shift (@_);
    47     my ($args) = @_;
    48 
    49     my $plugin_name = $class;
    50     $plugin_name =~ s/\.pm$//;
    51 
    52     if (!parsargv::parse($args, 
    53              "allow_extra_options")) {
    54 
    55     print STDERR "\nIncorrect options passed to $plugin_name, ";
    56     print STDERR "check your collect.cfg configuration file\n";
    57     $self->print_txt_usage("");  # Use default resource bundle
    58     die "\n";
    59     }
    60    
    61     return ($plugin_name);
    62 }
    6345
    6446sub new {
    … …  
    312294    $doc_obj->add_metadata($cursection, "TVal",          $song->{'tval'});
    313295
    314     foreach $md ( @{$song->{'metadata'}} )
     296    foreach my $md ( @{$song->{'metadata'}} )
    315297    {
    316298    $doc_obj->add_metadata($cursection, $md->[0], $md->[1]);

  • trunk/gsdl/perllib/plugins/DSpacePlug.pm

    r10218 r10254  
    5252#use ghtml;
    5353use XMLParser;
     54use strict;
     55no strict 'refs'; # allow filehandles to be variables and viceversa
    5456
    5557sub BEGIN {

  • trunk/gsdl/perllib/plugins/EMAILPlug.pm

    r10218 r10254  
    6363
    6464# 12/05/02 Added usage datastructure - John Thompson
     65package EMAILPlug;
    6566
    6667use strict;
    6768no strict "refs"; # so we can use a variable as a filehandle for print $out
    6869
    69 package EMAILPlug;
    7070
    7171use SplitPlug;
    72 # EMAILPlug is a sub-class of SplitPlug.
    73 @EMAILPlug::ISA = ('SplitPlug');
    74 
    7572use unicode;  # gs conv functions
    7673use gsprintf 'gsprintf'; # translations
    … …  
    7976use util;
    8077
     78sub BEGIN {
     79    @EMAILPlug::ISA = ('SplitPlug');
     80}
    8181
    8282

  • trunk/gsdl/perllib/plugins/ExcelPlug.pm

    r10218 r10254  
    2929
    3030use ConvertToPlug;
     31use strict;
     32no strict 'refs'; # allow filehandles to be variables and viceversa
    3133
    3234sub BEGIN {
    33     @ISA = ('ConvertToPlug');
     35    @ExcelPlug::ISA = ('ConvertToPlug');
    3436}
    3537

  • trunk/gsdl/perllib/plugins/FOXPlug.pm

    r10218 r10254  
    4040# use gb;
    4141
     42use strict;
     43no strict 'refs'; # allow filehandles to be variables and viceversa
     44
    4245
    4346sub BEGIN {
    44     @ISA = ('BasPlug');
    45 }
     47    @FOXPlug::ISA = ('BasPlug');
     48}
     49
     50my $arguments = [
     51         ];
    4652
    4753my $options = { 'name'     => "FOXPlug",
    … …  
    149155
    150156    # open the dbt file if we need to
    151     $dbtfullname = $fullname;
     157    my $dbtfullname = $fullname;
    152158    if ($fullname =~ /f$/) {
    153159    $dbtfullname =~ s/f$/t/;
    … …  
    172178    my $record = [];
    173179   
    174     foreach $field (@{$dbf{'fieldinfo'}}) {
     180    foreach my $field (@{$dbf{'fieldinfo'}}) {
    175181        my $fieldvalue = "";
    176182       
    … …  
    267273
    268274    # add each field
    269     foreach $field (@$record) {
     275    foreach my $field (@$record) {
    270276    if (defined ($field->{'name'}) && defined ($field->{'value'})) {
    271277        $doc_obj->add_utf8_text($section, "  <tr>\n");

  • trunk/gsdl/perllib/plugins/FavouritesPlug.pm

    r10218 r10254  
    3232use BasPlug;
    3333use parsargv;
     34use strict;
     35no strict 'refs'; # allow filehandles to be variables and viceversa
    3436
    3537sub BEGIN {
    … …  
    7880    my $outhandle = $self->{'outhandle'};
    7981
     82    my $section = $doc_obj->get_top_section();
    8083    print STDERR "<Processing n='$file' p='FavouritesPlug'>\n" if ($gli);
    8184    print $outhandle "FavouritesPlug: processing $file\n" if $self->{'verbosity'} > 1;
    … …  
    8790    my $title = $file;
    8891    $title =~ s/.url$//i;
    89     $doc_obj->add_utf8_metadata($cursection, "Title", $title);
     92    $doc_obj->add_utf8_metadata($section, "Title", $title);
    9093
    9194    # get the URL from the file
    9295    my ($url) = ($$textref =~ m/^URL=(http.+)/mg);
    93     $doc_obj->add_metadata($cursection, "URL", $url);
     96    $doc_obj->add_metadata($section, "URL", $url);
    9497
    9598    # Add srclink metadata for an automatic link to the webpage
    … …  
    103106    $$textref =~ s/\]/<\/strong><p>/g;
    104107    $$textref =~ s/^Modified=(.+)$/<strong>Modified<\/strong>$1<p>/g;
    105     $doc_obj->add_utf8_text($cursection, "$$textref");
     108    $doc_obj->add_utf8_text($section, "$$textref");
    106109
    107     $doc_obj->add_metadata($cursection, "FileFormat", "Favourite");
     110    $doc_obj->add_metadata($section, "FileFormat", "Favourite");
    108111    return 1;
    109112}

  • trunk/gsdl/perllib/plugins/GAPlug.pm

    r10218 r10254  
    3232
    3333use XMLPlug;
    34 #$%^
    35 use parse2;
     34
     35use strict;
     36no strict 'refs'; # allow filehandles to be variables and viceversa
    3637
    3738sub BEGIN {
    … …  
    4546    return q^(?i)doc\.xml$^;
    4647}
     48
     49my $arguments = [
     50         ];
    4751
    4852my $options = { 'name'     => "GAPlug",

  • trunk/gsdl/perllib/plugins/GISBasPlug.pm

    r9963 r10254  
    2828use util;
    2929use locale;
     30
     31use strict;
     32no strict 'refs'; # allow filehandles to be variables and viceversa
    3033
    3134#field categories in DataBase files
    … …  
    3538my $DSG = 10;
    3639#$CC1 = 12;
    37 $FULL_NAME = 22;
     40my $FULL_NAME = 22;
    3841
    3942BEGIN {
    … …  
    7679}
    7780
     81sub print_txt_usage
     82{
     83   BasPlug::print_txt_usage(@_);
     84}
    7885
    7986sub has_mapdata
    … …  
    153160sub placename_to_anchorname {
    154161    my ($placename) = @_;
    155     $p_tag = lc($placename);
     162    my $p_tag = lc($placename);
    156163    $p_tag =~ s/\s+//g;
    157164    return $p_tag;
    … …  
    202209    #finds 'dangerous' placenames (eg York and New York). Dangerous because program will find "York" within "New York" 
    203210    my %danger = ();   
    204     foreach $x (keys %$uniquePlaces){
    205     foreach $y (keys %$uniquePlaces){
     211    foreach my $x (keys %$uniquePlaces){
     212    foreach my $y (keys %$uniquePlaces){
    206213        if(($y =~ m/ /) && ($y =~ m/$x/) && ($y ne $x)){
    207214            $y =~ s/($x\s)|(\s$x)//;
    … …  
    220227    foreach my $name (sort (keys %$uniquePlaces)){
    221228    if(!defined($danger{$name})){
    222         $name_tag = placename_to_anchorname($name);
     229        my $name_tag = placename_to_anchorname($name);
    223230        print FOUT "$name\t" . $uniquePlaces->{$name}->[$LONG] . "\t" . $uniquePlaces->{$name}->[$LAT] . "\n";
    224231        if($self->{'place_list'}) {$names = $names . "<a href=\"#" . $name_tag . "1\">" . $name . "</a>" . "\n";}

  • trunk/gsdl/perllib/plugins/GMLPlug.pm

    r10218 r10254  
    3535use doc;
    3636
     37use strict;
     38no strict 'refs'; # allow filehandles to be variables and viceversa
     39
    3740sub BEGIN {
    38     @ISA = ('BasPlug');
     41    @GMLPlug::ISA = ('BasPlug');
    3942}
    4043

  • trunk/gsdl/perllib/plugins/HBPlug.pm

    r10218 r10254  
    3737# expects the marked up files to be cleaner than those used by the
    3838# Humanity Library collections
    39 
    40 # 12/05/02 Added usage datastructure - John Thompson
    4139
    4240package HBPlug;
    … …  
    4846use doc;
    4947
     48use strict;
     49no strict 'refs'; # allow filehandles to be variables and viceversa
    5050
    5151sub BEGIN {
    52     @ISA = ('BasPlug');
     52    @HBPlug::ISA = ('BasPlug');
    5353}
    5454

  • trunk/gsdl/perllib/plugins/ISISPlug.pm

    r10218 r10254  
    3131use SplitPlug;
    3232
     33use strict;
     34no strict 'refs'; # allow filehandles to be variables and viceversa
    3335
    3436# ISISPlug is a sub-class of SplitPlug.
    3537sub BEGIN {
    36     @ISA = ('SplitPlug');
     38    @ISISPlug::ISA = ('SplitPlug');
    3739}
    3840
    … …  
    155157    my $outhandle = $self->{'outhandle'};
    156158
     159    my $cursection = $doc_obj->get_top_section();
    157160    my $subfield_separator = $self->{'subfield_separator'};
    158161    my $entry_separator = $self->{'entry_separator'};
    … …  
    164167
    165168    # Process each line of the ISIS record, one at a time
    166     foreach $line (split(/\n/, $$textref)) {
     169    foreach my $line (split(/\n/, $$textref)) {
    167170    $line =~ /^tag=(.*) data=(.+)$/;
    168171    my $rawtagname = $1;
    … …  
    173176    # Metadata field names: title case, then remove spaces
    174177    my $tagname = "";
    175     foreach $word (split(/\s+/, $rawtagname)) {
     178    foreach my $word (split(/\s+/, $rawtagname)) {
    176179        substr($word, 0, 1) =~ tr/a-z/A-Z/;
    177180        $tagname .= $word;
    … …  
    183186    # Handle each piece of metadata ('%' separated)
    184187    my $completetagvalue = "";
    185     foreach $rawtagvalue (split(/%/, $rawtagdata)) {
     188    foreach my $rawtagvalue (split(/%/, $rawtagdata)) {
    186189        $completetagvalue .= $entry_separator unless ($completetagvalue eq "");
    187190
    … …  
    255258
    256259    my $amongstdefinitions = 0;
    257     foreach $fdtfileline (<FDT_FILE>) {
     260    foreach my $fdtfileline (<FDT_FILE>) {
    258261    $fdtfileline =~ s/(\s*)$//;  # Remove any nasty spaces at the end of the lines
    259262

  • trunk/gsdl/perllib/plugins/ImagePlug.pm

    r10218 r10254  
    2828use BasPlug;
    2929
     30use strict;
     31no strict 'refs'; # allow filehandles to be variables and viceversa
     32
    3033sub BEGIN {
    31     @ISA = ('BasPlug');
     34    @ImagePlug::ISA = ('BasPlug');
    3235}
    3336

  • trunk/gsdl/perllib/plugins/IndexPlug.pm

    r10218 r10254  
    6060use cfgread;
    6161
     62use strict;
     63no strict 'refs'; # allow filehandles to be variables and viceversa
     64
    6265sub BEGIN {
    63     @ISA = ('BasPlug');
     66    @IndexPlug::ISA = ('BasPlug');
    6467}
     68
     69my $arguments = [
     70         ];
    6571
    6672my $options = { 'name'     => "IndexPlug",

  • trunk/gsdl/perllib/plugins/LaTeXPlug.pm

    r10218 r10254  
    2929
    3030# System complains about $arguments if the strict is set
    31 #use strict;
    32 #no strict 'refs'; # so we can print to a handle named by a variable
     31use strict;
     32no strict 'refs'; # so we can print to a handle named by a variable
    3333
    3434# greenstone packages
    … …  
    3838use util;
    3939
     40my $arguments = [
     41         ];
    4042my $options={ 'name' => 'LaTeXPlug',
    4143          'desc' => '{LaTeXPlug.desc}',

  • trunk/gsdl/perllib/plugins/MACROPlug.pm

    r10218 r10254  
    2929use parsargv;
    3030
     31use strict;
     32no strict 'refs'; # allow filehandles to be variables and viceversa
    3133
    3234sub BEGIN {
    33     @ISA = ('BasPlug');
     35    @MACROPlug::ISA = ('BasPlug');
    3436}
    3537
    … …  
    175177    my $image_macro = "false";
    176178    my $norm_macro = "false";
    177 
     179    my $currpackage = "";
     180   
    178181    #print STDERR "FILE@@@@@ $file\n";
    179182
    180183    #foreach my $ta (@textarray) {
    181184   
    182     for ($k = 0; $k < scalar(@textarray); $k++) {
    183    
    184     $ta = $textarray[$k];
     185    for (my $k = 0; $k < scalar(@textarray); $k++) {
     186   
     187    my $ta = $textarray[$k];
    185188
    186189        #print STDERR "$ta\n" if ($file =~ m/port/);
    … …  
    370373    $results = $self->{'textcat'}->classify(\$text);
    371374
    372     foreach $r (@$results) {
     375    foreach my $r (@$results) {
    373376    print $outhandle "Results: $r\n";
    374377   
    … …  
    385388    while (<LANGFILE>) {
    386389       
    387         $line = $_;
     390        my $line = $_;
    388391        chomp($line);
    389392
    390         $fn = $filename;
     393        my $fn = $filename;
    391394        $fn =~ s/.*\/(.*)\..*/$1/;
    392395
    … …  
    398401        print $outhandle "language code is $line\n";
    399402
    400         foreach $r (@$results) {
     403        foreach my $r (@$results) {
    401404            print $outhandle "MY1 $r\n";
    402405
    403             $roar = $& if($r =~ m/../);
     406            my $roar = $& if($r =~ m/../);
    404407
    405408            if ($roar eq $line) {
    … …  
    486489
    487490    while ($try_len>=4) {
    488         $try_fn = substr($fn,0,$try_len);
     491        my $try_fn = substr($fn,0,$try_len);
    489492
    490493        if (defined $lang_table->{$try_fn}) {
    … …  
    509512    $fn =~ s/\d+$//; # remove any digits from end of filename
    510513
    511     my $languge;
     514    my $language;
    512515    my $encoding = "utf8";
    513516

  • trunk/gsdl/perllib/plugins/MARCPlug.pm

    r10218 r10254  
    3333use parsargv;
    3434
     35use strict;
     36no strict 'refs'; # allow filehandles to be variables and viceversa
     37
    3538sub BEGIN {
    36     @ISA = ('SplitPlug');
     39    @MARCPlug::ISA = ('SplitPlug');
    3740    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
    3841}
    … …  
    261264    my @words = split(/ /, $text);
    262265
    263     foreach $word (@words) {
     266    foreach my $word (@words) {
    264267    # If printing this word would exceed the column end, start a new line
    265268    if (($linelength + length($word)) >= $columnwidth) {
    … …  
    301304        foreach $metavalue ( @metavalues )
    302305        {
    303         $metavalue_str = $self->to_utf8($encoding,$metavalue->as_string());
    304         $doc_obj->add_utf8_metadata ($thissection, $metaname, $metavalue_str);
     306        my $metavalue_str = $self->to_utf8($encoding,$metavalue->as_string());
     307        $doc_obj->add_utf8_metadata ($section, $metaname, $metavalue_str);
    305308        }
    306309    }

  • trunk/gsdl/perllib/plugins/METSPlug.pm

    r10218 r10254  
    3535use ghtml;
    3636
     37use strict;
     38no strict 'refs'; # allow filehandles to be variables and viceversa
     39
    3740use XMLPlug;
    3841use XML::XPath;
    … …  
    4346}
    4447
     48my $arguments = [
     49         ];
    4550my $options = { 'name'     => "METSPlug",
    4651        'desc'     => "{METSPlug.desc}",

  • trunk/gsdl/perllib/plugins/MP3Plug.pm

    r10218 r10254  
    3131use parsargv;
    3232
     33use strict;
     34no strict 'refs'; # allow filehandles to be variables and viceversa
     35
    3336use MP3::Info;
    3437
    … …  
    3639
    3740sub BEGIN {
    38     @ISA = ('UnknownPlug');
     41    @MP3Plug::ISA = ('UnknownPlug');
    3942}
    4043
    … …  
    179182        if ($mp3_metavalue !~ m/^\s*$/s) {
    180183        my $kt_len = length($kt);
    181         $kt_initial_cap = uc(substr($kt,0,1)).lc(substr($kt,1,$kt_len-1));
     184        my $kt_initial_cap = uc(substr($kt,0,1)).lc(substr($kt,1,$kt_len-1));
    182185        my $mp3_metaname = "mp3:".$kt_initial_cap;
    183186       

  • trunk/gsdl/perllib/plugins/MetadataPass.pm

    r9959 r10254  
    2626package MetadataPass;
    2727
     28use strict;
     29no strict 'refs'; # allow filehandles to be variables and viceversa
    2830
    2931use BasPlug; # uses BasPlug, but is not inherited

  • trunk/gsdl/perllib/plugins/NULPlug.pm

    r10218 r10254  
    3838
    3939use BasPlug;
    40 use parsargv;
    4140
     41use strict;
     42no strict 'refs'; # allow filehandles to be variables and viceversa
    4243
    4344sub BEGIN {
    … …  
    4546}
    4647
    47 #my $arguments =
    48 #    [
    49 #      ];
     48my $arguments = [
     49         ];
    5050
    5151my $options = { 'name'     => "NULPlug",

  • trunk/gsdl/perllib/plugins/OAIPlug.pm

    r10218 r10254  
    3030use unicode;
    3131use util;
    32 use parsargv;
     32
     33use strict;
     34no strict 'refs'; # allow filehandles to be variables and viceversa
    3335
    3436use XMLPlug;
    … …  
    5355        'args'     => $arguments };
    5456
     57
    5558sub new {
    5659    my ($class) = shift (@_);
    … …  
    7376
    7477sub xml_start_document {
     78    my $self = shift (@_);
    7579    $self->{'in_metadata_node'} = 0;
    7680    $self->{'rawxml'} = "";
    … …  
    170174   
    171175    my $url_array = $metadata->{'URL'};
    172     my $num_urls = (defined $url_arry) ? scalar(@$url_array) : 0;
     176    my $num_urls = (defined $url_array) ? scalar(@$url_array) : 0;
    173177   
    174178    my $srcdoc_exists = 0;
    … …  
    331335    if ($$textref =~ m/<metadata\s*>(.*?)<\/metadata\s*>/s)
    332336    {
    333     $metadata_text = $1;
     337    my $metadata_text = $1;
    334338    $metadata_text =~ s/^.*?<(oai_dc:)?dc.*?>(.*?)<\/(oai_dc:)?dc>.*?/$2/s;
    335339

  • trunk/gsdl/perllib/plugins/OggVorbisPlug.pm

    r10218 r10254  
    3333use Ogg::Vorbis::Header::PurePerl;
    3434
     35use strict;
     36no strict 'refs'; # allow filehandles to be variables and viceversa
    3537
    3638sub BEGIN {
    … …  
    103105    my $doc_obj = new doc ($filename, "indexed_doc");
    104106    $doc_obj->set_OIDtype ("incremental");    # this is done to avoid hashing content of file
    105 
     107    my $section = $doc_obj->get_top_section();
     108   
    106109    # replace spaces in filename with %20 in url for metadata entry
    107110    my $url = $file;
    … …  
    153156
    154157    # include any metadata passed in from previous plugins
    155     my $section = $doc_obj->get_top_section();
    156158    $self->extra_metadata ($doc_obj, $section, $metadata);
    157159

  • trunk/gsdl/perllib/plugins/PPTPlug.pm

    r10218 r10254  
    2929
    3030use ConvertToPlug;
     31use strict;
     32no strict 'refs'; # allow filehandles to be variables and viceversa
    3133
    3234sub BEGIN {
    33     @ISA = ('ConvertToPlug');
     35    @PPTPlug::ISA = ('ConvertToPlug');
    3436}
    3537

  • trunk/gsdl/perllib/plugins/PSPlug.pm

    r10218 r10254  
    3131use sorttools;
    3232
     33use strict;
     34no strict 'refs'; # allow filehandles to be variables and viceversa
     35
    3336sub BEGIN {
    34     @ISA = ('ConvertToPlug');
     37    @PSPlug::ISA = ('ConvertToPlug');
    3538}
    3639

  • trunk/gsdl/perllib/plugins/PagedImgPlug.pm

    r10218 r10254  
    135135
    136136use XMLPlug;
     137use strict;
     138no strict 'refs'; # allow filehandles to be variables and viceversa
    137139
    138140sub BEGIN {
    … …  
    282284    my $filehead = &util::get_tmp_filename();
    283285    $filename = $filehead . ".$converttotype";
    284     $n = 1;
     286    my $n = 1;
    285287    while (-e $filename) {
    286288        $filename = "$filehead$n\.$converttotype";
    … …  
    527529
    528530sub read {
    529     $self = shift (@_);
     531    my $self = shift (@_);
    530532    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
    531533    my $outhandle   = $self->{'outhandle'};
    … …  
    643645    $self->extra_metadata ($doc_obj, $section, $metadata);
    644646
    645     # do plugin specific processing of doc_obj
    646     unless (defined ($self->process(\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj))) {
    647     print STDERR "<ProcessingError n='$file'>\n" if ($gli);
    648     return -1;
    649     }
     647    # do plugin specific processing of doc_obj - don't need this unless
     648    # something inherits from PagedImgPlug
     649    #unless (defined ($self->process(\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj))) {
     650#   print STDERR "<ProcessingError n='$file'>\n" if ($gli);
     651#   return -1;
     652#    }
    650653
    651654    # do any automatic metadata extraction
    … …  
    806809    if ($line =~ /^<([^>]*)>(.*?)\s*$/) {
    807810        $doc_obj->set_utf8_metadata_element ($topsection, $1, $2);
    808         $meta->{$1} = $2;
     811        #$meta->{$1} = $2;
    809812    } else {
    810813        $num++;

  • trunk/gsdl/perllib/plugins/ProCitePlug.pm

    r10218 r10254  
    3131use SplitPlug;
    3232
     33use strict;
     34no strict 'refs'; # allow filehandles to be variables and viceversa
    3335
    3436# ProCitePlug is a sub-class of SplitPlug
    3537sub BEGIN {
    36     @ISA = ('SplitPlug');
     38    @ProCitePlug::ISA = ('SplitPlug');
    3739}
    3840
    … …  
    158160    my $outhandle = $self->{'outhandle'};
    159161    my $filename = &util::filename_cat($base_dir, $file);
    160 
     162    my $cursection = $doc_obj->get_top_section();
    161163    # Report that we're processing the file
    162164    print STDERR "<Processing n='$file' p='ProCitePlug'>\n" if ($gli);
    … …  
    216218
    217219        # Multiple metadata values are separated with "//"
    218         foreach $field_value (split(/\/\//, $field_value_raw)) {
     220        foreach my $field_value (split(/\/\//, $field_value_raw)) {
    219221        my $meta_name = "pc.Field" . ($fieldnum + 1) . "Value";
    220222        $doc_obj->add_utf8_metadata($cursection, $meta_name, $field_value);

  • trunk/gsdl/perllib/plugins/RTFPlug.pm

    r10218 r10254  
    3030
    3131use ConvertToPlug;
     32use strict;
     33no strict 'refs'; # allow filehandles to be variables and viceversa
    3234
    3335sub BEGIN {
    34     @ISA = ('ConvertToPlug');
     36    @RTFPlug::ISA = ('ConvertToPlug');
    3537}
    3638

  • trunk/gsdl/perllib/plugins/RecPlug.pm

    r10218 r10254  
    9999
    100100use File::Basename;
    101 
     101use strict;
     102no strict 'refs';
    102103
    103104BEGIN {

  • trunk/gsdl/perllib/plugins/ReferPlug.pm

    r10218 r10254  
    6666
    6767use SplitPlug;
     68use strict;
     69no strict 'refs'; # allow filehandles to be variables and viceversa
    6870
    6971# ReferPlug is a sub-class of BasPlug.
    7072sub BEGIN {
    71     @ISA = ('SplitPlug');
     73    @ReferPlug::ISA = ('SplitPlug');
    7274}
    7375
    … …  
    125127    return undef unless ($$textref =~ /^\s*%/);
    126128
     129    my $cursection = $doc_obj->get_top_section();
    127130    # Report that we're processing the file
    128131    print STDERR "<Processing n='$file' p='ReferPlug'>\n" if ($gli);
    … …  
    165168    $line =~ s/\s+/ /g;
    166169    $text .= "$line\n";
    167     $ReferFormat .= "$line\n";
     170    # $ReferFormat .= "$line\n"; # what is this???
    168171   
    169172    next unless ($line =~ /^%[A-Z\*]/);

  • trunk/gsdl/perllib/plugins/RogPlug.pm

    r10218 r10254  
    3232use doc;
    3333
     34use strict;
     35no strict 'refs'; # allow filehandles to be variables and viceversa
     36
    3437sub BEGIN {
    35     @ISA = ('BasPlug');
     38    @RogPlug::ISA = ('BasPlug');
    3639}
    3740
    … …  
    196199    $doc_obj->add_metadata($cursection, "FileSize",      (-s $file));
    197200
    198     foreach $md ( @{$song->{'metadata'}} )
     201    foreach my $md ( @{$song->{'metadata'}} )
    199202    {
    200203    $doc_obj->add_metadata($cursection, $md->[0], $md->[1]);

  • trunk/gsdl/perllib/plugins/SRCPlug.pm

    r10218 r10254  
    4242use parsargv;
    4343
     44use strict;
     45no strict 'refs'; # allow filehandles to be variables and viceversa
     46
    4447sub BEGIN {
    45     @ISA = ('BasPlug');
     48    @SRCPlug::ISA = ('BasPlug');
    4649}
    4750
    … …  
    174177    ($$textref =~ m/^\s*\#\s*include\s*(?:\"|&lt;)(.*?)(?:\"|&gt;)/mg);
    175178   
    176     my $incs_done_ref=$doc_obj->get_metadata($section, "includes");
     179    my $incs_done_ref=$doc_obj->get_metadata($topsection, "includes");
    177180    my @incs_done;
    178181    if (defined($incs_done_ref)) {
    … …  
    230233        my $classname=$1;
    231234        $classname =~ s/.*class\W(\w+).*/$1/;
    232         my $classes=$doc_obj->get_metadata($section, "class");
     235        my $classes=$doc_obj->get_metadata($topsection, "class");
    233236        foreach my $elem (@$classes) {
    234237            if ("$elem" eq "$classname") {goto class_done;}

  • trunk/gsdl/perllib/plugins/SplitPlug.pm

    r10218 r10254  
    4444use util;
    4545
     46use strict;
     47no strict 'refs'; # allow filehandles to be variables and viceversa
     48
    4649# SplitPlug is a sub-class of BasPlug.
    4750sub BEGIN {
    48 @SplitPlug::ISA = ('BasPlug');
     51    @SplitPlug::ISA = ('BasPlug');
    4952}
    5053
    … …  
    120123                          $extrametadata, $processor,
    121124                          $maxdocs, $gli);
    122     $split_matched = undef;
     125    my $split_matched = undef;
    123126
    124127    if ($matched) {

  • trunk/gsdl/perllib/plugins/TEXTPlug.pm

    r10218 r10254  
    3232
    3333use BasPlug;
    34 use parsargv;
    3534
     35use strict;
     36no strict 'refs'; # allow filehandles to be variables and viceversa
    3637
    3738sub BEGIN {
    38     @ISA = ('BasPlug');
     39    @TEXTPlug::ISA = ('BasPlug');
    3940}
    4041

  • trunk/gsdl/perllib/plugins/UnknownPlug.pm

    r10218 r10254  
    5757
    5858use BasPlug;
    59 use parsargv;
    60 #$%^
    61 use parse2;
    62 
    63 
     59
     60use strict;
     61no strict 'refs'; # allow filehandles to be variables and viceversa
    6462
    6563sub BEGIN {

  • trunk/gsdl/perllib/plugins/W3ImgPlug.pm

    r10218 r10254  
    117117use util;
    118118use parsargv;
    119 use strict 'subs';
     119use strict; # 'subs';
     120no strict 'refs'; # allow filehandles to be variables and viceversa
    120121
    121122sub BEGIN {
    122     @ISA = qw( HTMLPlug );
     123    @W3ImgPlug::ISA = qw( HTMLPlug );
    123124}
    124125
    … …  
    423424        $doc_obj = new doc ("", "indexed_doc");
    424425        $section = $doc_obj->get_top_section();
    425         $prevpos = ( $i == 0 ? 0 : $imgs->{$fplist[$i - 1]}{'pos'});
    426         $nextpos = ( $i >= ($nimgs -1) ? -1 : $imgs->{$fplist[$i + 1]}{'pos'} );
     426        my $prevpos = ( $i == 0 ? 0 : $imgs->{$fplist[$i - 1]}{'pos'});
     427        my $nextpos = ( $i >= ($nimgs -1) ? -1 : $imgs->{$fplist[$i + 1]}{'pos'} );
    427428
    428429        $self->extract_image_info($imgtag, $filepath, $textref, $doc_obj, $section, $tndir, $prevpos, $nextpos);
    … …  
    459460    $orig_fp =~ s/\\/\//g;
    460461    $filepath = "$self->{'htpath'}/$filepath";
    461     ($onlyfn) = $filename =~ /([^\\\/]*)$/;
     462    my ($onlyfn) = $filename =~ /([^\\\/]*)$/;
    462463    ($fn, $ext) = $onlyfn =~ /(.*)\.(.*)/;
    463464    $fn = lc $fn; $ext = lc $ext;
    … …  
    601602    if ( $self->{'aggressiveness'} == 5 && ! $self->{'smallpage'} ) {
    602603    @pagemeta = $self->get_page_metadata($textref);
    603     foreach $value ( @pagemeta ) {
     604    foreach my $value ( @pagemeta ) {
    604605        $context .= "$value."; # make each into psuedo-sentence
    605606    }
    … …  
    611612
    612613    # extract general references
    613     foreach $rw ( @refwords ) {
     614    foreach my $rw ( @refwords ) {
    614615    while ( $context =~ /[\.\?\!\,](.*?$rw\W.*?[\.\?\!\,])/ig ) {
    615         $sentence = $1;
     616        my $sentence = $1;
    616617        $sentence =~ s/\s+/ /g;
    617618        $sentences{$sentence}+=2;
    … …  
    621622    my ($fignum) = $context =~ /[\.\?\!].*?(?:figure|table)s?[\-\_\ \.](\d+\w*)\W.*?[\.\?\!]/ig;
    622623    if ( $fignum ) {
    623     foreach $rw ( @refwords ) {
     624    foreach my $rw ( @refwords ) {
    624625        while ( $context =~ /[\.\?\!](.*?(figure|table)[\-\_\ \.]$fignum\W.*?[\.\?\!])/ig ) {
    625         $sentence = $1;
     626        my $sentence = $1;
    626627        $sentence =~ s/\s+/ /g;
    627628        $sentences{$sentence}+=4;
    … …  
    632633    # sentences with occurances of important words
    633634    @relwords = $reltext =~ /([a-zA-Z]{4,})/g; # take out small words
    634     foreach $word ( @relwords ) {
     635    foreach my $word ( @relwords ) {
    635636    if ( $self->{'stopwords'}{$word} ) { next } # skip stop words
    636637    while ( $context =~ /([^\.\?\!]*?$word\W.*?[\.\?\!])/ig ) {
    637         $sentence = $1;
     638        my $sentence = $1;
    638639        $sentence =~ s/\s+/ /g;
    639640        $sentences{$sentence}++;
    640641    }
    641642    }
    642     foreach $sentence ( keys %sentences ) {
     643    foreach my $sentence ( keys %sentences ) {
    643644    if ($sentences{$sentence} < $self->{'textrefs_threshold'}) {
    644645        delete $sentences{$sentence};
    … …  
    656657sub extract_caption_text {
    657658    my ($self, $tag, $textref, $prevpos, $pos, $nextpos) = (@_);
    658     my (@neartext, $len, $hdelim, $goodlen,
     659    my (@neartext, $len, $hdelim, $mintext, $goodlen,
    659660    $startpos, $context, $context_size);
    660661   
    … …  
    10031004    }
    10041005    $num = 0;
    1005     foreach $i ( keys %{$imgs} ) {
     1006    foreach my $i ( keys %{$imgs} ) {
    10061007    if ( $imgs->{$i}{'pos'} ) {
    10071008        $num++;

  • trunk/gsdl/perllib/plugins/WordPlug.pm

    r10218 r10254  
    2929
    3030use ConvertToPlug;
     31use strict;
     32no strict 'refs'; # allow filehandles to be variables and viceversa
    3133
    3234sub BEGIN {
    33     @ISA = ('ConvertToPlug');
     35    @WordPlug::ISA = ('ConvertToPlug');
    3436}
    3537

  • trunk/gsdl/perllib/plugins/XMLPlug.pm

    r10218 r10254  
    2828use BasPlug;
    2929use doc;
    30 #$%^
    31 use parse2;
     30use strict;
     31no strict 'refs'; # allow filehandles to be variables and viceversa
    3232
    3333sub BEGIN {
    … …  
    106106    if (open(XMLIN,"<$filename")) {
    107107
    108         $untransformed_xml = "";
     108        my $untransformed_xml = "";
    109109        while (defined (my $line = <XMLIN>)) {
    110110
    … …  
    138138    }
    139139    else {
    140     print $outhandle "Error: Unable to run command $xsl_cmd\n";
     140    print $outhandle "Error: Unable to run command $xslt_cmd\n";
    141141    print $outhandle "       $!\n";
    142142    }

  • trunk/gsdl/perllib/plugins/ZIPPlug.pm

    r10218 r10254  
    5050use util;
    5151use Cwd;
    52 #$%^
    53 use parse2;
    54 
     52
     53use strict;
     54no strict 'refs'; # allow filehandles to be variables and viceversa
    5555
    5656BEGIN {
    57     @ISA = ('BasPlug');
     57    @ZIPPlug::ISA = ('BasPlug');
    5858}
    5959
Note: See TracChangeset for help on using the changeset viewer.