Changeset 1755

Timestamp:

2000-12-07T11:45:39+13:00 (23 years ago)

Author:

say1

Message:

added better cycle detection (but still not perfect)

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -69 +69 @@
 
     my (@dir, $subfile);
-
     my $count = 0;
 
- 
     # see if this is a directory
     my $dirname = &util::filename_cat ($base_dir, $file);
+
+    # check to make sure we're not reading our own archives 
+    # or index directory
+    if ($dirname =~ m%^$ENV{'GSDLHOME'}/.*/import.*/(archives|index)$%) {
+    print $outhandle "RecPlug: $dirname appears to be a reference to a Greenstone collection, skipping.\n";
+    return 1;
+    }
+
+    # check to see we haven't got a cyclic path...
+    if ($dirname =~ m%(/.*){,41}%) {
+    print $outhandle "RecPlug: $dirname is 40 directories deep, is this a recursive path? if not increase constant in RecPlug.pm.\n";
+    return 1;
+    }
+
+    # check to see we haven't got a cyclic path...
+    if ($dirname =~ m%.*?import/(.+?)/import/\1.*%) {
+    print $outhandle "RecPlug: $dirname appears to a recursive loop ...\n";
+    return 1;
+    }
+
+
     if (-d $dirname) {
 
+    if ($dirname =~ m|/CVS$|) {
+        print $outhandle "RecPlug: $dirname is a CVS directory, skipping.\n";
+        return 1;
+    }
     # read all the files in the directory
         if (!opendir (DIR, $dirname))
@@ -83 +106 @@
             return;
         }
-    if ($dirname =~ m|/CVS$|) {
-        print $outhandle "RecPlug: $dirname is a CVS directory, skipping.\n";
-        return 1;
-    }
 
     @dir = readdir (DIR);