moved url pattern matching for search to better place

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

source/de/anomic/plasma/plasmaSearchEvent.java

@@ -420,6 +420,9 @@ public final class plasmaSearchEvent extends Thread implements Runnable {
                 	if (plasmaSearchQuery.matches(pageurl, query.excludeHashes)) continue ordering;
                 	if (plasmaSearchQuery.matches(pageauthor, query.excludeHashes)) continue ordering;
                 	
+                	// check url mask
+                	if (!(pageurl.matches(query.urlMask))) continue ordering;
+                	
                 	// check constraints
                 	if ((!(query.constraint.equals(plasmaSearchQuery.catchall_constraint))) &&
                         (query.constraint.get(plasmaCondenser.flag_cat_indexof)) &&

source/de/anomic/plasma/plasmaSwitchboard.java

@@ -2793,18 +2793,16 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
                     result.setUrl(urlstring);
                     result.setUrlname(urlname);
                     result.setUrlentry(urlentry);
-                    if (urlstring.matches(results.getQuery().urlMask)) { //.* is default
-                        if (includeSnippets) {
-                            result.setSnippet(snippetCache.retrieveTextSnippet(comp.url(), results.getQuery().queryHashes, false, urlentry.flags().get(plasmaCondenser.flag_cat_indexof), 260, 1000));
-                            //snippet = snippetCache.retrieveTextSnippet(comp.url(), query.queryHashes, false, urlentry.flags().get(plasmaCondenser.flag_cat_indexof), 260, 1000);
-                        } else {
-                            //snippet = null;
-                            result.setSnippet(null);
-                        }
-                        i++;
-                        results.appendResult(result);
-                    }
-                }
+                    if (includeSnippets) {
+						result.setSnippet(snippetCache.retrieveTextSnippet(comp.url(), results.getQuery().queryHashes, false, urlentry.flags().get(plasmaCondenser.flag_cat_indexof), 260, 1000));
+						// snippet = snippetCache.retrieveTextSnippet(comp.url(), query.queryHashes, false, urlentry.flags().get(plasmaCondenser.flag_cat_indexof), 260, 1000);
+					} else {
+						// snippet = null;
+						result.setSnippet(null);
+					}
+					i++;
+					results.appendResult(result);
+				}
                 log.logFine("SEARCH TIME AFTER RESULT PREPARATION: " + ((System.currentTimeMillis() - timestamp) / 1000) + " seconds");
                 
                 // calc some more cross-reference