Changeset 10463 for trunk/gsdl/bin/script

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.

File:

• trunk/gsdl/bin/script/import.pl (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);
+    }
     }