Changeset 10463

Timestamp:

2005-08-10T15:25:28+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removing the collection "tmp" directory is now only done when "-removeold" is specified to import.pl.

Location:

trunk/gsdl

Files:

• bin/script/import.pl (modified) (1 diff)
• perllib/plugins/ConvertToPlug.pm (modified) (2 diffs)
• perllib/strings.rb (modified) (1 diff)

trunk/gsdl/bin/script/import.pl

@@ -410 +410 @@
     }
 
-    # remove the old contents of the archives directory if needed
-    if ($removeold && -e $archivedir) {
-    &gsprintf($out, "{import.removing_archives}\n");
-    &util::rm_r ($archivedir);
+    # remove the old contents of the archives directory (and tmp directory) if needed
+    if ($removeold) {
+    if (-e $archivedir) {
+        &gsprintf($out, "{import.removing_archives}\n");
+        &util::rm_r ($archivedir);
+    }
+    $tmpdir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "tmp");
+    $tmpdir =~ s/[\\\/]+/\//g;
+    $tmpdir =~ s/\/$//;
+    if (-e $tmpdir) {
+        &gsprintf($out, "{import.removing_tmpdir}\n");
+        &util::rm_r ($tmpdir);
+    }
     }
 

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -321 +321 @@
 
 
-# Remove collection specific tmp directory and all its contents.
-sub cleanup_tmp_area {
-    my $self = shift (@_);
-
-    my $tmp_dirname 
-    = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");
-    &util::rm_r($tmp_dirname);
-    &util::mk_dir($tmp_dirname);
-}
-
 # Override BasPlug read
 # We don't want to get language encoding stuff until after we've converted
@@ -406 +396 @@
     # process the document
     $processor->process($doc_obj);
-    ##$self->cleanup_tmp_area();
 
     $self->{'num_processed'} ++;

trunk/gsdl/perllib/strings.rb

@@ -223 +223 @@
 import.removing_archives:Removing current contents of the archives directory...
 
+import.removing_tmpdir:Removing contents of the collection "tmp" directory...
+
 import.sortmeta:Sort documents alphabetically by metadata for building. Search results for boolean queries will be displayed in this order. This will be disabled if groupsize > 1.