Changeset 9197 for trunk/gsdl/perllib/lucenebuilder.pm

Timestamp:

2005-02-25T16:57:45+13:00 (19 years ago)

Author:

kjdon

Message:

a few changes to make it work on windows

File:

• trunk/gsdl/perllib/lucenebuilder.pm (modified) (5 diffs)

trunk/gsdl/perllib/lucenebuilder.pm

@@ -75 +75 @@
     # the text directory
     my $text_dir = &util::filename_cat($self->{'build_dir'}, "text");
-    my $build_dir = $self->{'build_dir'};
+    my $build_dir = &util::filename_cat($self->{'build_dir'},"");
     &util::mk_all_dir ($text_dir);
 
@@ -93 +93 @@
 
     my $lucene_passes_exe = &util::filename_cat($scriptdir, "lucene_passes.pl");
+    my $full_lucene_passes_exe = $lucene_passes_exe;
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $full_lucene_passes_exe = "perl.exe -S $lucene_passes_exe";
+    }
     my $lucene_passes_sections = "Doc";
 
@@ -101 +105 @@
     } else {
     if (!-e "$lucene_passes_exe" || 
-        !open (PIPEOUT, "| $lucene_passes_exe text $lucene_passes_sections \"$build_dir\" \"poo\"   $osextra")) {
+        !open (PIPEOUT, "| $full_lucene_passes_exe text $lucene_passes_sections \"$build_dir\" \"dummy\"   $osextra")) {
         print STDERR "<FatalError name='NoRunLucenePasses'/>\n</Stage>\n" if $self->{'gli'};
         die "lucenebuilder::build_index - couldn't run $lucene_passes_exe\n";
@@ -198 +202 @@
     my $exe = &util::get_os_exe ();
     my $lucene_passes_exe = &util::filename_cat($scriptdir, "lucene_passes.pl");
+    my $full_lucene_passes_exe = $lucene_passes_exe;
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $full_lucene_passes_exe = "perl.exe -S $lucene_passes_exe";
+    }
 
     # define the section names for lucenepasses
@@ -259 +267 @@
     } else {
     if (!-e "$lucene_passes_exe" || 
-        !open (PIPEOUT, "| $lucene_passes_exe index $lucene_passes_sections \"$build_dir\" \"$indexdir\"   $osextra")) {
+        !open (PIPEOUT, "| $full_lucene_passes_exe index $lucene_passes_sections \"$build_dir\" \"$indexdir\"   $osextra")) {
         print STDERR "<FatalError name='NoRunLucenePasses'/>\n</Stage>\n" if $self->{'gli'};
         die "lucenebuilder::build_index - couldn't run $lucene_passes_exe\n";