reverted last commit (more testing needed)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5356 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/CrawlProfileEditor_p.java

@@ -62,8 +62,9 @@ public class CrawlProfileEditor_p {
     static {
         labels.add(new eentry(entry.NAME,                "Name",                  true,  eentry.STRING));
         labels.add(new eentry(entry.START_URL,           "Start URL",             true,  eentry.STRING));
-        labels.add(new eentry(entry.FILTER_MUSTMATCH,   "General Filter",       false, eentry.STRING));
-        labels.add(new eentry(entry.DEPTH,    "General Depth",        false, eentry.INTEGER));
+        labels.add(new eentry(entry.FILTER_MUSTMATCH,    "Must-Match Filter",     false, eentry.STRING));
+        labels.add(new eentry(entry.FILTER_MUSTNOTMATCH, "Must-Not-Match Filter", false, eentry.STRING));
+        labels.add(new eentry(entry.DEPTH,               "Crawl Depth",           false, eentry.INTEGER));
         labels.add(new eentry(entry.RECRAWL_IF_OLDER,    "Recrawl If Older",      false, eentry.INTEGER));
         labels.add(new eentry(entry.DOM_FILTER_DEPTH,    "Domain Filter Depth",   false, eentry.INTEGER));
         labels.add(new eentry(entry.DOM_MAX_PAGES,       "Domain Max. Pages",     false, eentry.INTEGER));

htroot/CrawlStart_p.html

@@ -116,7 +116,7 @@
         <tr valign="top" class="TableCellDark">
           <td><label for="mustnotmatch">Must-Not-Match Filter</label>:</td>
           <td>
-			<input name="mustnotmatch" id="mustnotmatch" type="text" size="80" maxlength="100" value="#[mustnotmatch]#" />
+			<input name="mustnotmatch" id="mustnotmatch" type="text" size="60" maxlength="100" value="#[mustnotmatch]#" />
 		  </td>
           <td>
             This filter must not match to allow that the page is accepted for crawling.

source/de/anomic/kelondro/kelondroChunkIterator.java

@@ -24,6 +24,8 @@
 
 package de.anomic.kelondro;
 
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -32,9 +34,6 @@ import java.util.Iterator;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 public class kelondroChunkIterator implements Iterator<byte[]> {
 
@@ -50,9 +49,11 @@ public class kelondroChunkIterator implements Iterator<byte[]> {
      * @throws FileNotFoundException 
      */
     
-    /*
+    
     private final DataInputStream stream;
     private byte[] nextBytes;
+    private int recordsize;
+    
     public kelondroChunkIterator(final File file, final int recordsize, final int chunksize) throws FileNotFoundException {
         assert (file.exists());
         assert file.length() % recordsize == 0;
@@ -95,9 +96,9 @@ public class kelondroChunkIterator implements Iterator<byte[]> {
     public void remove() {
         throw new UnsupportedOperationException();
     }
-    */
     
     
+    /*
     ExecutorService service = Executors.newFixedThreadPool(2);
     filechunkProducer producer;
     filechunkSlicer slicer;
@@ -142,6 +143,7 @@ public class kelondroChunkIterator implements Iterator<byte[]> {
     public void remove() {
         throw new UnsupportedOperationException();
     }
+    */
     
     private static class filechunkSlicer implements Callable<Integer> {