greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16263

Show
Ignore:
Timestamp:
2008-07-01 17:13:09 (6 months ago)
Author:
mdewsnip
Message:

Added "use strict" and fixed a few really ugly things.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gsdl/trunk/bin/script/lucene_passes.pl

    r14924 r16263  
    3131    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    3232    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    33     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan"); 
    34     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins"); 
    35     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/classify"); 
    36 } 
    37  
     33} 
     34 
     35 
     36use strict; 
    3837use util; 
    39 use ghtml; 
     38 
    4039 
    4140sub open_java_lucene 
    …… 
    5049  my $java_cmd = "$java_lucene $cmd_options $doc_tag_level \"$full_builddir\" $indexdir"; 
    5150 
    52   open (PIPEOUT, "| $java_cmd") or die "$PROGNAME - couldn't run $java_cmd\n"; 
    53 } 
     51  open (PIPEOUT, "| $java_cmd") or die "lucene_passes.pl - couldn't run $java_cmd\n"; 
     52} 
     53 
    5454 
    5555sub close_java_lucene 
    …… 
    5858} 
    5959 
     60 
    6061sub save_xml_doc 
    6162{ 
    6263    my ($full_textdir,$output_filename,$doc_xml) = @_; 
    63     $dir_sep = &util::get_os_dirsep(); 
     64 
     65    my $dir_sep = &util::get_os_dirsep(); 
    6466 
    6567    my $full_output_filename = &util::filename_cat($full_textdir,$output_filename); 
    …… 
    7678} 
    7779 
     80 
    7881sub compress_xml_doc 
    7982{ 
    …… 
    8588    `gzip $full_output_filename`; 
    8689} 
     90 
    8791 
    8892# This appears to be the callback that gets the xml stream during the 
    …… 
    178182          die "\n\nCannot continue"; 
    179183        } 
    180         $removeoid = $argv[$i]; 
    181         print STDERR "\n\nWe're removing the document with id: '$removeoid'\n"; 
     184        my $oid = $argv[$i]; 
     185        print STDERR "\n\nWe're removing the document with id: '$oid'\n"; 
    182186 
    183187        # Now, to make sure this gets through to the Java executable 
    184         $create = "-create -remove '$removeoid'"; 
     188        $create = "-create -remove '$oid'"; 
    185189      } 
    186190 
    …… 
    205209 
    206210  if ($filtered_argc < 4) { 
    207     print STDERR "Usage: $PROGNAME [-create|-verbosity num] \"text\"|\"index\" doc-tag-level build-dir index-name\n"; 
     211    print STDERR "Usage: lucene_passes.pl [-create|-verbosity num] \"text\"|\"index\" doc-tag-level build-dir index-name\n"; 
    208212    exit 1; 
    209213  } 
    …… 
    215219###    print STDERR "**** ARGS = ", join(" ", @argv), "\n"; 
    216220 
     221  # We only need the Lucene handle opened if we are indexing the documents, not if we are just storing the text 
     222  if ($mode eq "index") { 
     223    open_java_lucene($doc_tag_level,$full_builddir,$indexdir,$create,$verbosity); 
     224  } 
     225 
     226  print STDERR "Monitoring for input!\n"; 
    217227  my $full_textdir = &util::filename_cat($full_builddir,"text"); 
    218  
    219   if ($mode eq "index") { 
    220 # don't need the lucene stuff if we are just storing the docs 
    221     open_java_lucene($doc_tag_level,$full_builddir,$indexdir,$create,$verbosity); 
    222   } 
    223   print STDERR "Monitoring for input!\n"; 
    224228  monitor_xml_stream($mode, $full_textdir); 
     229 
    225230  if ($mode eq "index") { 
    226231    close_java_lucene(); 
    …… 
    228233} 
    229234 
    230 $PROGNAME = $0; 
    231 $PROGNAME =~ s/^.*\/(.*)$/$1/; 
    232235 
    233236&main(@ARGV); 
    234