git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5758 6c8d…

…7289-2bf4-0310-a012-ef5d649a1542
yacy · Mar 30, 2009 · 587838b · 587838b
1 parent d2e2420
commit 587838b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
@@ -103,13 +103,14 @@ public static serverObjects respond(final httpRequestHeader header, final server
             prop.put("input_count", "10");
             prop.put("input_offset", "0");
             prop.put("input_resource", "global");
-            prop.put("input_urlmaskfilter", ".*");
-            prop.put("input_prefermaskfilter", "");
+            prop.put("input_urlmaskfilter", (post == null) ? ".*" : post.get("urlmaskfilter", ".*"));
+            prop.put("input_prefermaskfilter", (post == null) ? "" : post.get("prefermaskfilter", ""));
+            prop.put("input_tenant", (post == null) ? "" : post.get("tenant", ""));
             prop.put("input_indexof", "off");
             prop.put("input_constraint", "");
             prop.put("input_cat", "href");
             prop.put("input_depth", "0");
-            prop.put("input_verify", "true");
+            prop.put("input_verify", (post == null) ? "true" : post.get("verify", "true"));
             prop.put("input_contentdom", "text");
             prop.put("input_contentdomCheckText", "1");
             prop.put("input_contentdomCheckAudio", "0");
@@ -285,6 +286,10 @@ public static serverObjects respond(final httpRequestHeader header, final server
                     }
                 }
             }
+            if (post.containsKey("tenant")) {
+                final String tenant = post.get("tenant");
+                if (urlmask == null) urlmask = ".*" + tenant + ".*"; else urlmask = ".*" + tenant + urlmask;
+            }
             if (urlmask == null || urlmask.length() == 0) urlmask = originalUrlMask; //if no urlmask was given
 
             // read the language from the language-restrict option 'lr'

diff --git a/source/de/anomic/crawler/Balancer.java b/source/de/anomic/crawler/Balancer.java
@@ -564,7 +564,9 @@ public synchronized CrawlEntry pop(boolean delay, CrawlProfile profile) throws I
         final int s = urlFileIndex.size();
         Row.Entry rowEntry = urlFileIndex.remove(result.getBytes());
         if (rowEntry == null) {
-            throw new IOException("get() found a valid urlhash, but failed to fetch the corresponding url entry - total size = " + size() + ", fileStack.size() = " + urlFileStack.size() + ", ramStack.size() = " + urlRAMStack.size() + ", domainStacks.size() = " + domainStacks.size());
+            String error = "get() found a valid urlhash, but failed to fetch the corresponding url entry - total size = " + size() + ", fileStack.size() = " + urlFileStack.size() + ", ramStack.size() = " + urlRAMStack.size() + ", domainStacks.size() = " + domainStacks.size();
+            //this.clear();
+            throw new IOException(error + " - cleared the balancer");
         }
         assert urlFileIndex.size() + 1 == s : "urlFileIndex.size() = " + urlFileIndex.size() + ", s = " + s + ", result = " + result;
         final CrawlEntry crawlEntry = new CrawlEntry(rowEntry);

diff --git a/source/de/anomic/kelondro/blob/HeapWriter.java b/source/de/anomic/kelondro/blob/HeapWriter.java
@@ -103,14 +103,17 @@ public synchronized void add(final byte[] key, final byte[] blob) throws IOExcep
     }
 
     protected static File fingerprintIndexFile(File f) {
+        assert f != null;
         return new File(f.getParentFile(), f.getName() + "." + fingerprintFileHash(f) + ".idx");
     }
 
     protected static File fingerprintGapFile(File f) {
+        assert f != null;
         return new File(f.getParentFile(), f.getName() + "." + fingerprintFileHash(f) + ".gap");
     }
 
     protected static String fingerprintFileHash(File f) {
+        assert f != null;
         return Digest.fastFingerprintB64(f, false).substring(0, 12);
     }
 

diff --git a/source/de/anomic/yacy/dht/Dispatcher.java b/source/de/anomic/yacy/dht/Dispatcher.java
@@ -256,6 +256,7 @@ private ArrayList<ReferenceContainer>[] splitContainers(ArrayList<ReferenceConta
      * then no additional IO is necessary.
      */
     private void enqueueContainersToCloud(final ArrayList<ReferenceContainer>[] containers) {
+        if (transmissionCloud == null) return;
         ReferenceContainer lastContainer;
         String primaryTarget;
         Transmission.Chunk entry;