Changeset 2700 for trunk/gsdl

Timestamp:

2001-08-15T10:51:45+12:00 (23 years ago)

Author:

cs025

Message:

fixed this up for building under windows

File:

• trunk/gsdl/perllib/mgppbuilder.pm (modified) (10 diffs)

trunk/gsdl/perllib/mgppbuilder.pm

@@ -248 +248 @@
     &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));
 
-    my $builddir = $self->{'build_dir'};
     my $basefilename = "text/$self->{'collection'}";
-
+    my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, $basefilename);
+
+   my $osextra = "";
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
-    $basefilename =~ s/\//\\/g;
-    $builddir =~ s/\//\\/g;
-    
+    $fulltextprefix =~ s/\//\\/g;
     } 
+    else {
+    $osextra = " -d /";
+    }
 
 
@@ -277 +279 @@
     } else {
     if (!-e "$mgpp_passes_exe" || 
-        !open (PIPEOUT, "| mgpp_passes$exe $mgpp_passes_sections  -d $builddir -f $basefilename -T1")) {
+        !open (PIPEOUT, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra")) {
         die "mgppbuilder::compress_text - couldn't run $mgpp_passes_exe\n";
     }
     $handle = mgppbuilder::PIPEOUT;
     }
-
     $self->{'buildproc'}->set_output_handle ($handle);
     $self->{'buildproc'}->set_mode ('text');
@@ -317 +318 @@
         die "mgppbuilder::compress_text - couldn't run $mgpp_compression_dict_exe\n";
     }
-    system ("mgpp_compression_dict$exe -d $builddir -f $basefilename -S -H -2 -k 5120");
+    system ("mgpp_compression_dict$exe -f \"$fulltextprefix\" -S -H -2 -k 5120 $osextra");
 
     if (!$self->{'debug'}) {
         if (!-e "$mgpp_passes_exe" || 
-        !open ($handle, "| mgpp_passes$exe $mgpp_passes_sections -f $basefilename -d $builddir -T2")) {
+        !open ($handle, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T2 $osextra")) {
         die "mgppbuilder::compress_text - couldn't run $mgpp_passes_exe\n";
         }
@@ -514 +515 @@
     my $indexdir = $self->{'index_mapping'}->{$index};
     &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, $indexdir));
-    my $builddir = $self->{'build_dir'};
-
-    my $basefilename = &util::filename_cat ($indexdir, 
+    my $fullindexprefix = &util::filename_cat ($self->{'build_dir'}, 
+                           $indexdir, 
+                           $self->{'collection'});
+    my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, "text", 
                            $self->{'collection'});
 
@@ -542 +544 @@
     &util::filename_cat ($exedir, "mgpp_stem_idx$exe");
 
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) { 
-    $builddir=~ s/\//\\/g;
-    $basefilename =~ s/\//\\/g; 
-    }
-
+     my $osextra = "";
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $fullindexprefix =~ s/\//\\/g;
+    } else {
+    $osextra = " -d /";
+    }
+ 
     # get the index expression if this index belongs
     # to a subcollection
@@ -592 +596 @@
     } else {
     if (!-e "$mgpp_passes_exe" || 
-        !open (PIPEOUT, "| mgpp_passes$exe $mgpp_passes_sections  -d $builddir -f $basefilename -I1")) {
+        !open (PIPEOUT, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fullindexprefix\" -I1 $osextra")) {
         die "mgppbuilder::build_index - couldn't run $mgpp_passes_exe\n";
     }
@@ -618 +622 @@
         die "mgppbuilder::build_index - couldn't run $mgpp_perf_hash_build_exe\n";
     }
-    system ("mgpp_perf_hash_build$exe -d $builddir -f $basefilename");
+    system ("mgpp_perf_hash_build$exe -f \"$fullindexprefix\" $osextra");
 
     if (!-e "$mgpp_passes_exe" || 
-        !open ($handle, "| mgpp_passes$exe $mgpp_passes_sections  -d $builddir -f $basefilename -I2")) {
+        !open ($handle, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fullindexprefix\" -I2 $osextra")) {
         die "mgppbuilder::build_index - couldn't run $mgpp_passes_exe\n";
     }
@@ -644 +648 @@
         die "mgppbuilder::build_index - couldn't run $mgpp_weights_build_exe\n";
     }
-    system ("mgpp_weights_build$exe -d $builddir -f $basefilename");
+    system ("mgpp_weights_build$exe -f \"$fullindexprefix\" $osextra");
 
     # create 'on-disk' stemmed dictionary
@@ -651 +655 @@
         die "mgppbuilder::build_index - couldn't run $mgpp_invf_dict_exe\n";
     }
-    system ("mgpp_invf_dict$exe -d $builddir -f $basefilename");
+    system ("mgpp_invf_dict$exe -f \"$fullindexprefix\" $osextra" );
 
 
@@ -659 +663 @@
         die "mgppbuilder::build_index - couldn't run $mgpp_stem_idx_exe\n";
     }
-    system ("mgpp_stem_idx$exe -b 4096 -s1 -d $builddir -f $basefilename");
-    system ("mgpp_stem_idx$exe -b 4096 -s2 -d $builddir -f $basefilename");
-    system ("mgpp_stem_idx$exe -b 4096 -s3 -d $builddir -f $basefilename");
+    system ("mgpp_stem_idx$exe -b 4096 -s1 -f \"$fullindexprefix\" $osextra");
+    system ("mgpp_stem_idx$exe -b 4096 -s2 -f \"$fullindexprefix\" $osextra");
+    system ("mgpp_stem_idx$exe -b 4096 -s3 -f \"$fullindexprefix\" $osextra");