Changeset 2795

Timestamp:

2001-10-12T11:05:43+13:00 (23 years ago)

Author:

sjboddie

Message:

Got ZIPPlug working under under windows

Location:

trunk/gsdl/perllib

Files:

• plugins/BasPlug.pm (modified) (2 diffs)
• plugins/GMLPlug.pm (modified) (1 diff)
• plugins/RecPlug.pm (modified) (1 diff)
• plugins/ZIPPlug.pm (modified) (7 diffs)
• util.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -262 +262 @@
     my $outhandle = $self->{'outhandle'};
 
-    my $filename = &util::filename_cat($base_dir, $file);
+    my $filename = $file;
+    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
+
     if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
     $self->{'num_blocked'} ++;
@@ -695 +697 @@
 }
 
-
 1;

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -57 +57 @@
     my $outhandle = $self->{'outhandle'};
 
-    my $filename = &util::filename_cat($base_dir, $file);
+    my $filename = $file;
+    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
+
     return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;
     if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -156 +156 @@
     # Calculate the directory name and ensure it is a directory and
     # that it is not explicitly blocked.
-    $file =~ s/^[\/\\]+//; 
-    my $dirname = &util::filename_cat ($base_dir, $file);
+    my $dirname = $file;
+    $dirname = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
     return undef unless (-d $dirname);
     return 0 if ($self->{'block_exp'} ne "" && $dirname =~ /$self->{'block_exp'}/);
-
 
     # check to make sure we're not reading the archives or index directory

trunk/gsdl/perllib/plugins/ZIPPlug.pm

@@ -43 +43 @@
 # tar (for tar) 
 
-# ZIPPlug is currently disabled on windows as we can't expect any of the
-# above utilities to be present on that OS. We should probably provide
-# binaries with Greenstone some day.
-
 package ZIPPlug;
 
@@ -81 +77 @@
     my $outhandle = $self->{'outhandle'};
 
-    # disabled on windows
-    return undef if ($ENV{'GSDLOS'} =~ /^windows$/i);
-
     if ($file =~ /\.(gz|tgz|z|taz|bz|bz2|zip|jar|tar)$/i) {
 
-    my $filename = &util::filename_cat ($base_dir, $file);
+    my $filename = $file;
+    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
     if (!-e $filename) {
         print $outhandle "ZIPPLug: WARNING: $filename does not exist\n";
@@ -132 +126 @@
     my $self = shift (@_);
     my ($file) = @_;
+
     if (system ("bunzip $file")!=0)
     {
@@ -141 +136 @@
     my $self = shift (@_);
     my ($file) = @_;
+
     if (system ("bunzip2 $file")!=0)
     {
@@ -150 +146 @@
     my $self = shift (@_);
     my ($file) = @_;
+
     system ("unzip $file");
     &util::rm ($file) if -e $file;
@@ -157 +154 @@
     my $self = shift (@_);
     my ($file) = @_;
+
     system ("tar xf $file");
     &util::rm ($file) if -e $file;
@@ -164 +162 @@
     my $self = shift (@_);
     my ($file) = @_;
+
     if (system ("gunzip $file")!=0)
     {

trunk/gsdl/perllib/util.pm

@@ -475 +475 @@
 
 sub get_tmp_filename {
-    my $tmpdir = "$ENV{'GSDLHOME'}/tmp";
+    my $tmpdir = filename_cat($ENV{'GSDLHOME'}, "tmp");
     &mk_all_dir ($tmpdir) unless -e $tmpdir;
 
     my $count = 1000;
     my $rand = int(rand $count);
-    while (-e "$tmpdir/F$rand") {
+    while (-e &filename_cat($tmpdir, "F$rand")) {
     $rand = int(rand $count);
     $count++;
     }
 
-    return "$tmpdir/F$rand";
+    return filename_cat($tmpdir, "F$rand");
 }