Changeset 2509

Timestamp:

2001-06-07T21:53:32+12:00 (23 years ago)

Author:

sjboddie

Message:

Fixed (bypassed really) a problem with the phind classifier on windows
where it was failing to clean up temporary files after it was finished.
The problem appears to be that a couple of temporary files that were
opened in the perl code were not being closed again (close() was failing),
hence they could not be deleted until the perl code had exited. The
cleanup is now done in an END block which seems to work ok. Should spend
more time trying to work out why the close() fails sometime in case it's
indicative of a more serious problem.

File:

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

trunk/gsdl/perllib/classify/phind.pm

@@ -38 +38 @@
 use unicode;
 
+my @removedirs = ();
+
+my %wanted_index_files = ('td'=>1,
+              't'=>1,
+              'ti'=>1,
+              'tl'=>1,
+              'tsd'=>1,
+              'idb'=>1,
+              'ib1'=>1,
+              'ib2'=>1,
+              'ib3'=>1,
+              'i'=>1,
+              'il'=>1,
+              'w'=>1,
+              'wa'=>1);
+
 sub BEGIN {
     @ISA = ('BasClas');
 }
 
+sub END {
+    
+    # Tidy up stray files - we do this here as there's some weird problem
+    # preventing us from doing it in the get_classify_info() function (on
+    # windows at least) where the close() appears to fail on txthandle and
+    # dochandle, thus preventing us from deleting those files
+
+    foreach my $dir (@removedirs) {
+    if (-d $dir && opendir (DIR, $dir)) {
+        my @files = readdir DIR;
+        closedir DIR;
+    
+        foreach $file (@files) {
+        next if $file =~ /^\.\.?$/;
+        my ($suffix) = $file =~ /\.([^\.]+)$/;
+        if (!defined $suffix || !defined $wanted_index_files{$suffix}) {
+            # delete it!
+            &util::rm (&util::filename_cat ($dir, $file));
+        }
+        }
+    }
+    }
+}
 
 sub print_usage {
@@ -83 +122 @@
 "; }
 
-
-%wanted_index_files = ('td'=>1,
-               't'=>1,
-               'ti'=>1,
-               'tl'=>1,
-               'tsd'=>1,
-               'idb'=>1,
-               'ib1'=>1,
-               'ib2'=>1,
-               'ib3'=>1,
-               'i'=>1,
-               'il'=>1,
-               'w'=>1,
-               'wa'=>1);
-
-
-
 # Phrase delimiter symbols - these should be abstracted out someplace
 
@@ -116 +138 @@
 
     my $out = $self->{'outhandle'};
-
-
-    # Phind installation check
-    # The phind phrase browser is research software and is not installed
-    # by defualt.  If the user attepts to use it we warn them that it's a
-    # bit dodgy, then tell them how to install it.  If they can do that 
-    # and get all the files in place, then we let them proceed.
-    
-    print $out "Checking Phind phrase browser requirements...\n";
 
     # Ensure the Phind generate scripts are in place
@@ -194 +207 @@
     $self->{'phindnumber'} = $phnumber;
 
+    push(@removedirs, $phinddir) unless $self->{'untidy'};
+
     # open filehandles for documents and text
     my $clausefile =  &util::filename_cat("$phinddir", "clauses");
@@ -386 +401 @@
     &execute("mgpp_passes $osextra -f $mg_stem -T2 $mg_input", $verbosity, $out);
 
-    # Tidy up stray files
-    if (!$self->{'untidy'}) {
-    print $out "\nCleaning up\n" if ($verbosity > 2);
-    opendir (DIR, $phinddir) || die;
-    my @files = readdir DIR;
-    closedir DIR;
-    
-    foreach $file (@files) {
-        next if $file =~ /^\.\.?$/;
-        my ($suffix) = $file =~ /\.([^\.]+)$/;
-        if (!defined $suffix || !defined $wanted_index_files{$suffix}) {
-        # delete it!
-        print $out "deleting $file\n"; # if $verbosity > 2;
-        &util::rm (&util::filename_cat ($phinddir, $file));
-        }
-    }
-    }
-
     # Return the information about the classifier that we'll later want to
     # use to create macros when the Phind classifier document is displayed.