bugfix for the notdir in the recursive functions

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1351 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Jan 16, 2006 · 1f9ff68 · 1f9ff68
1 parent da81d7d
commit 1f9ff68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/source/de/anomic/data/listManager.java b/source/de/anomic/data/listManager.java
@@ -211,23 +211,23 @@ public static String[] getDirListing(String dirname){
         return null;
     }
 
-    public static ArrayList getDirsRecursive(File dir){
-        return getDirsRecursive(dir, true);
+    public static ArrayList getDirsRecursive(File dir, String notdir){
+        return getDirsRecursive(dir, notdir, true);
     }
     /**
      * Returns a List of all dirs and subdirs as File Objects
      *
      * Warning: untested
      */
-    public static ArrayList getDirsRecursive(File dir, boolean excludeDotfiles){
+    public static ArrayList getDirsRecursive(File dir, String notdir, boolean excludeDotfiles){
         final File[] dirList = dir.listFiles();
         final ArrayList resultList = new ArrayList();
         ArrayList recursive;
         Iterator iter;
         for (int i=0;i<dirList.length;i++) {
-            if (dirList[i].isDirectory() && (!excludeDotfiles || !dirList[i].getName().startsWith("."))) {
+            if (dirList[i].isDirectory() && (!excludeDotfiles || !dirList[i].getName().startsWith(".")) && !dirList[i].getName().equals(notdir)) {
                 resultList.add(dirList[i]);
-                recursive = getDirsRecursive(dirList[i], excludeDotfiles);
+                recursive = getDirsRecursive(dirList[i], notdir, excludeDotfiles);
                 iter=recursive.iterator();
                 while (iter.hasNext()) {
                     resultList.add(iter.next());
@@ -275,4 +275,4 @@ public static void reloadBlacklists(){
 //       switchboard.urlBlacklist.clear();
 //       if (f != "") switchboard.urlBlacklist.loadLists("black", f, "/");
     }
-}
+}
diff --git a/source/de/anomic/data/translator.java b/source/de/anomic/data/translator.java
@@ -201,7 +201,7 @@ public static boolean translateFiles(File sourceDir, File destDir, File baseDir,
 	}
 
     public static boolean translateFilesRecursive(File sourceDir, File destDir, File translationFile, String extensions, String notdir){
-        ArrayList dirList=listManager.getDirsRecursive(sourceDir);
+        ArrayList dirList=listManager.getDirsRecursive(sourceDir, notdir);
         dirList.add(sourceDir);
         Iterator it=dirList.iterator();
         File file=null;