fixed urlmask which was not able to combine several constraints

source/net/yacy/search/query/QueryParams.java

@@ -178,16 +178,13 @@ public final class QueryParams {
         }
         this.urlMask_isCatchall = this.urlMask.toString().equals(catchall_pattern.toString());
         if (this.urlMask_isCatchall) {
-            if (modifier.protocol != null) {
+            String protocolfilter = modifier.protocol == null ? ".*" : modifier.protocol;
-                this.urlMask = Pattern.compile(modifier.protocol + ".*");
+            String defaulthostprefix = modifier.protocol == null ? "www" : modifier.protocol;
-                this.urlMask_isCatchall = false;
+            String hostfilter = modifier.sitehost == null && tld == null ? ".*" : modifier.sitehost == null ? ".*\\." + tld : modifier.sitehost.startsWith(defaulthostprefix + ".") ? "(" + defaulthostprefix + "\\.)?" + modifier.sitehost.substring(4) : "(" + defaulthostprefix + "\\.)?" + modifier.sitehost;
-            }
+            String filefilter = modifier.filetype == null ? ".*" : ".*" + modifier.filetype + ".*";
-            if (tld != null) {
+            String filter = protocolfilter + "://" + hostfilter + "/" + filefilter;
-                this.urlMask = Pattern.compile(".*\\." + tld + ".*");
+            if (!filter.equals(".*://.*/.*")) {
-                this.urlMask_isCatchall = false;
+                this.urlMask = Pattern.compile(filter);
-            }
-            if (modifier.filetype != null) {
-                this.urlMask = Pattern.compile(".*" + modifier.filetype + ".*");
                 this.urlMask_isCatchall = false;
             }
         }