boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

- enhanced description on search front page

Browse Source 
- fixed language and heuristic modifier
- added hint to crawl start that we can do also ftp and smb crawls
- added a protocol extension to remote crawls to transport all search modifiers to remote peers

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@8108 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 13 years ago
parent 2512119e5f
commit ebd840ebf6
10 changed files with 126 additions and 62 deletions
Show Stats Download Patch File Download Diff File

2
htroot/CrawlStartExpert_p.html
Unescape View File

@ -41,7 +41,7 @@
<td> <td>
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<tr> <tr>
<td><label for="url"><span class="nobr">From URL</span></label>:</td> <td><label for="url"><span class="nobr">From URL<br/>(http/https/ftp/smb/file)</span></label>:</td>
<td><input type="radio" name="crawlingMode" id="url" value="url" checked="checked" /></td> <td><input type="radio" name="crawlingMode" id="url" value="url" checked="checked" /></td>
<td> <td>
<input name="crawlingURL" id="crawlingURL" type="text" size="41" maxlength="256" value="#[starturl]#" onkeypress="changed()" onfocus="check('url')" /> <input name="crawlingURL" id="crawlingURL" type="text" size="41" maxlength="256" value="#[starturl]#" onkeypress="changed()" onfocus="check('url')" />

2
htroot/CrawlStartSite_p.html
Unescape View File

@ -39,7 +39,7 @@
<dd> <dd>
<table border="0" cellpadding="0" cellspacing="0"><tr valign="top"> <table border="0" cellpadding="0" cellspacing="0"><tr valign="top">
<td valign="top"><input type="radio" name="crawlingMode" id="url" value="url" checked="checked" <td valign="top"><input type="radio" name="crawlingMode" id="url" value="url" checked="checked"
onmousedown="document.getElementById('rangeDomain').disabled=false;document.getElementById('rangeSubpath').disabled=false;document.getElementById('crawlingDomMaxCheck').disabled=false;document.getElementById('crawlingDomMaxPages').disabled=false;document.getElementById('crawlingQ').disabled=false;"/>Start URL</td> onmousedown="document.getElementById('rangeDomain').disabled=false;document.getElementById('rangeSubpath').disabled=false;document.getElementById('crawlingDomMaxCheck').disabled=false;document.getElementById('crawlingDomMaxPages').disabled=false;document.getElementById('crawlingQ').disabled=false;"/>Start URL<br/>(http/https/ftp/smb/file)</td>
<td valign="top"> <td valign="top">
<input name="crawlingURL" id="crawlingURL" type="text" size="50" maxlength="256" value="#[starturl]#" onkeypress="changed()" onfocus="check('url')" style="font-size:16px"/><br/> <input name="crawlingURL" id="crawlingURL" type="text" size="50" maxlength="256" value="#[starturl]#" onkeypress="changed()" onfocus="check('url')" style="font-size:16px"/><br/>
<input name="bookmarkTitle" id="bookmarkTitle" type="text" size="50" maxlength="256" value="" readonly="readonly" style="background:transparent; border:0px"/> <input name="bookmarkTitle" id="bookmarkTitle" type="text" size="50" maxlength="256" value="" readonly="readonly" style="background:transparent; border:0px"/>

77
htroot/index.html
Unescape View File

@ -98,7 +98,7 @@
<table> <table>
<tr> <tr>
<td><label for="count">Max. number of results</label>:</td> <td><label for="count">Results per page</label>:</td>
<td> <td>
<input type="radio" name="maximumRecords" value="10" #(count-10)#::checked="checked"#(/count-10)#/>10 <input type="radio" name="maximumRecords" value="10" #(count-10)#::checked="checked"#(/count-10)#/>10
<input type="radio" name="maximumRecords" value="50" #(count-50)#::checked="checked"#(/count-50)#/>50 <input type="radio" name="maximumRecords" value="50" #(count-50)#::checked="checked"#(/count-50)#/>50
@ -109,8 +109,8 @@
#(resource-select)#:: #(resource-select)#::
<td><label for="resource">Resource</label>:</td> <td><label for="resource">Resource</label>:</td>
<td> <td>
<input type="radio" name="resource" value="global" #(global)#::checked="checked"#(/global)# #(global-disabled)#::disabled="disabled"#(/global-disabled)#/>global <input type="radio" name="resource" value="global" #(global)#::checked="checked"#(/global)# #(global-disabled)#::disabled="disabled"#(/global-disabled)#/>the peer-to-peer network
<input type="radio" name="resource" value="local" #(local)#::checked="checked"#(/local)#/>local <input type="radio" name="resource" value="local" #(local)#::checked="checked"#(/local)#/>only the local index
</td> </td>
#(/resource-select)# #(/resource-select)#
</tr> </tr>
@ -145,22 +145,14 @@
<input type="checkbox" id="indexof" name="indexof" #[indexofChecked]# /> <label for="indexof">only index pages</label> <input type="checkbox" id="indexof" name="indexof" #[indexofChecked]# /> <label for="indexof">only index pages</label>
</td> </td>
</tr> </tr>
<tr><td></td><td></td></tr>
<tr>
<td>
<a href="http://www.yacy-websuche.de/wiki/index.php/En:SearchParameters">help: advanced parameters</a>
</td>
<td>
</td>
</tr>
</table> </table>
<h4>Query Operators</h4> <h4>Query Operators</h4>
<dl style="width:800px"> <dl style="width:700px">
<dt>restrictions</dt> <dt style="width:100px">restrictions</dt>
<dd> <dd>
<dl style="width:600px"> <dl style="width:500px">
<dt>inurl:&lt;phrase&gt;</dt> <dt>inurl:&lt;phrase&gt;</dt>
<dd>only urls with the &lt;phrase&gt; in the url</dd> <dd>only urls with the &lt;phrase&gt; in the url</dd>
<dt>filetype:&lt;ext&gt;</dt> <dt>filetype:&lt;ext&gt;</dt>
@ -171,39 +163,64 @@
<dd>only pages with as-author-anotated &lt;author&gt;</dd> <dd>only pages with as-author-anotated &lt;author&gt;</dd>
<dt>tld:&lt;tld&gt;</dt> <dt>tld:&lt;tld&gt;</dt>
<dd>only pages from top-level-domains &lt;tld&gt;</dd> <dd>only pages from top-level-domains &lt;tld&gt;</dd>
<dt>/http or /https</dt> <dt>/http</dt>
<dd>only resources from http or https servers</dd> <dd>only resources from http or https servers</dd>
<dt>/ftp</dt> <dt>/ftp</dt>
<dd>only resources from ftp servers</dd> <dd>only resources from ftp servers (they are rare, <a href="/CrawlStartSite_p.html">crawl them yourself</a>)</dd>
<dt>/smb</dt> <dt>/smb</dt>
<dd>only resources from smb server</dd> <dd>only resources from smb servers (<a href="/ConfigBasic.html">Intranet Indexing</a> must be selected)</dd>
<dt>/file</dt> <dt>/file</dt>
<dd>only files from the local file system (intranet mode must be selected)</dd> <dd>only files from a local file system (<a href="/ConfigBasic.html">Intranet Indexing</a> must be selected)</dd>
</dl> </dl>
</dd> </dd>
<dt>ranking modifier</dt> <dt style="width:100px">ranking modifier</dt>
<dd> <dd>
<dl style="width:600px"> <dl style="width:500px">
<dt>/date</dt> <dt>/date</dt>
<dd>sort by date (latest first)</dd> <dd>sort by date (latest first)</dd>
<dt>/near</dt> <dt>/near</dt>
<dd>multiple words shall appear near</dd> <dd>multiple words shall appear near</dd>
<dt>"" (doublequotes)</dt> <dt>"" (doublequotes)</dt>
<dd>multiple words shall appear near</dd> <dd>multiple words shall appear near</dd>
<dt>/language/&lt;2-character language code&gt;</dt> <dt>/language/&lt;lang&gt;</dt>
<dd>prefer given language</dd> <dd>prefer given language (an ISO639 2-letter code)</dd>
</dl> </dl>
</dd> </dd>
<dt>heuristics</dt> <dt style="width:100px">heuristics</dt>
<dd> <dd>
<dl style="width:600px"> <dl style="width:500px">
<dt>heuristic:scroogle</dt> <dt>/heuristic/scroogle</dt>
<dd>add search results from scroogle</dd> <dd>add search results from scroogle</dd>
<dt>heuristic:blekko</dt> <dt>/heuristic/blekko</dt>
<dd>add search results from blekko</dd> <dd>add search results from blekko</dd>
</dl> </dl>
</dd> </dd>
</dl> </dl>
<h4>Search Navigation</h4>
<dl style="width:700px">
<dt style="width:100px">keyboard shotcuts</dt>
<dd>
<dl style="width:500px">
<dt>tab or page-up</dt>
<dd>next result page</dd>
<dt>page-down</dt>
<dd>previous result page</dd>
</dl>
</dd>
<dt style="width:100px">automatic result retrieval</dt>
<dd>
<dl style="width:500px">
<dt>browser integration</dt>
<dd>after searching, click-open on the default search engine in the upper right search field of your browser and select 'Add "YaCy Search.."'</dd>
<dt>search as rss feed</dt>
<dd>click on the red icon in the upper right after a search. this works good in combination with the '/date' ranking modifier. See an <a href="http://localhost:8090/yacysearch.rss?query=news+%2Fdate&Enter=Search&verify=cacheonly&contentdom=text&nav=hosts%2Cauthors%2Cnamespace%2Ctopics%2Cfiletype%2Cprotocol&startRecord=0&indexof=off&meanCount=5&maximumRecords=10&resource=global&urlmaskfilter=.*&prefermaskfilter=">example</a>.</dd>
<dt>json search results</dt>
<dd>for ajax developers: get the search rss feed and replace the '.rss' extension in the search result url with '.json'</dd>
</dl>
</dd>
</dl>
#(/searchoptions)# #(/searchoptions)#
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
@ -215,8 +232,6 @@
:: ::
#%env/templates/simplefooter.template%# #%env/templates/simplefooter.template%#
#(/topmenu)# #(/topmenu)#
<p>
<img src="cytag.png?icon=invisible&amp;nick=yacyh_#[clientid]#&amp;tag=search" alt=""/> <img src="cytag.png?icon=invisible&amp;nick=yacyh_#[clientid]#&amp;tag=search" alt=""/>
</p>
</body> </body>
</html> </html>

3
htroot/yacy/search.java
Unescape View File

@ -116,6 +116,7 @@ public final class search {
final long maxtime = Math.min((int) sb.getConfigLong(SwitchboardConstants.REMOTESEARCH_MAXTIME_DEFAULT, 3000), post.getLong("time", 3000)); // maximum waiting time final long maxtime = Math.min((int) sb.getConfigLong(SwitchboardConstants.REMOTESEARCH_MAXTIME_DEFAULT, 3000), post.getLong("time", 3000)); // maximum waiting time
final int maxdist= post.getInt("maxdist", Integer.MAX_VALUE); final int maxdist= post.getInt("maxdist", Integer.MAX_VALUE);
final String prefer = post.get("prefer", ""); final String prefer = post.get("prefer", "");
final String modifier = post.get("modifier", "").trim();
final String contentdom = post.get("contentdom", "text"); final String contentdom = post.get("contentdom", "text");
final String filter = post.get("filter", ".*"); // a filter on the url final String filter = post.get("filter", ".*"); // a filter on the url
final Pattern snippetPattern = Pattern.compile(post.get("snippet", ".*")); // a filter on the snippet final Pattern snippetPattern = Pattern.compile(post.get("snippet", ".*")); // a filter on the snippet
@ -228,6 +229,7 @@ public final class search {
null, null,
snippetPattern, snippetPattern,
null, null,
modifier,
maxdist, maxdist,
prefer, prefer,
ContentDomain.contentdomParser(contentdom), ContentDomain.contentdomParser(contentdom),
@ -288,6 +290,7 @@ public final class search {
null, null,
snippetPattern, snippetPattern,
null, null,
modifier,
maxdist, maxdist,
prefer, prefer,
ContentDomain.contentdomParser(contentdom), ContentDomain.contentdomParser(contentdom),

44
htroot/yacysearch.java
Unescape View File

@ -278,7 +278,7 @@ public class yacysearch {
} }
} }
if ((!block) && (post == null || post.get("cat", "href").equals("href"))) { if (!block && (post == null || post.get("cat", "href").equals("href"))) {
String urlmask = null; String urlmask = null;
// check available memory and clean up if necessary // check available memory and clean up if necessary
@ -288,34 +288,42 @@ public class yacysearch {
} }
final RankingProfile ranking = sb.getRanking(); final RankingProfile ranking = sb.getRanking();
final StringBuilder modifier = new StringBuilder(20);
if (querystring.indexOf("/near",0) >= 0) { if (querystring.indexOf("/near",0) >= 0) {
querystring = querystring.replace("/near", ""); querystring = querystring.replace("/near", "");
ranking.coeff_worddistance = RankingProfile.COEFF_MAX; ranking.coeff_worddistance = RankingProfile.COEFF_MAX;
modifier.append("/near ");
} }
if (querystring.indexOf("/date",0) >= 0) { if (querystring.indexOf("/date",0) >= 0) {
querystring = querystring.replace("/date", ""); querystring = querystring.replace("/date", "");
ranking.coeff_date = RankingProfile.COEFF_MAX; ranking.coeff_date = RankingProfile.COEFF_MAX;
modifier.append("/date ");
} }
if (querystring.indexOf("/http",0) >= 0) { if (querystring.indexOf("/http",0) >= 0) {
querystring = querystring.replace("/http", ""); querystring = querystring.replace("/http", "");
urlmask = "https?://.*"; urlmask = "https?://.*";
modifier.append("/http ");
} }
if (querystring.indexOf("/https",0) >= 0) { if (querystring.indexOf("/https",0) >= 0) {
querystring = querystring.replace("/https", ""); querystring = querystring.replace("/https", "");
urlmask = "https?://.*"; urlmask = "https?://.*";
modifier.append("/https ");
} }
if (querystring.indexOf("/ftp",0) >= 0) { if (querystring.indexOf("/ftp",0) >= 0) {
querystring = querystring.replace("/ftp", ""); querystring = querystring.replace("/ftp", "");
urlmask = "ftp://.*"; urlmask = "ftp://.*";
modifier.append("/ftp ");
} }
if (querystring.indexOf("/smb",0) >= 0) { if (querystring.indexOf("/smb",0) >= 0) {
querystring = querystring.replace("/smb", ""); querystring = querystring.replace("/smb", "");
urlmask = "smb://.*"; urlmask = "smb://.*";
modifier.append("/smb ");
} }
if (querystring.indexOf("/file",0) >= 0) { if (querystring.indexOf("/file",0) >= 0) {
querystring = querystring.replace("/file", ""); querystring = querystring.replace("/file", "");
urlmask = "file://.*"; urlmask = "file://.*";
modifier.append("/file ");
} }
if (querystring.indexOf("/location",0) >= 0) { if (querystring.indexOf("/location",0) >= 0) {
querystring = querystring.replace("/location", ""); querystring = querystring.replace("/location", "");
@ -323,16 +331,17 @@ public class yacysearch {
constraint = new Bitfield(4); constraint = new Bitfield(4);
} }
constraint.set(Condenser.flag_cat_haslocation, true); constraint.set(Condenser.flag_cat_haslocation, true);
modifier.append("/location ");
} }
final int lrp = querystring.indexOf("/language/",0); final int lrp = querystring.indexOf("/language/",0);
String lr = ""; String language = "";
if (lrp >= 0) { if (lrp >= 0) {
if (querystring.length() >= (lrp + 11)) { if (querystring.length() >= (lrp + 12)) {
lr = querystring.substring(lrp + 9, lrp + 11); language = querystring.substring(lrp + 10, lrp + 12);
} }
querystring = querystring.replace("/language/" + language, "");
querystring = querystring.replace("/language/" + lr, ""); language = language.toLowerCase();
lr = lr.toLowerCase(); modifier.append("/language/").append(language).append(" ");
} }
final int inurl = querystring.indexOf("inurl:",0); final int inurl = querystring.indexOf("inurl:",0);
if (inurl >= 0) { if (inurl >= 0) {
@ -343,8 +352,9 @@ public class yacysearch {
final String urlstr = querystring.substring(inurl + 6, ftb); final String urlstr = querystring.substring(inurl + 6, ftb);
querystring = querystring.replace("inurl:" + urlstr, ""); querystring = querystring.replace("inurl:" + urlstr, "");
if (!urlstr.isEmpty()) { if (!urlstr.isEmpty()) {
urlmask = ".*" + urlstr + ".*"; urlmask = urlmask == null ? ".*" + urlstr + ".*" : urlmask + urlstr + ".*";
} }
modifier.append("inurl:").append(urlstr).append(" ");
} }
final int filetype = querystring.indexOf("filetype:",0); final int filetype = querystring.indexOf("filetype:",0);
if (filetype >= 0) { if (filetype >= 0) {
@ -362,6 +372,7 @@ public class yacysearch {
urlmask = urlmask + ".*\\." + ft; urlmask = urlmask + ".*\\." + ft;
} }
} }
modifier.append("filetype:").append(ft).append(" ");
} }
String tenant = null; String tenant = null;
if (post.containsKey("tenant")) { if (post.containsKey("tenant")) {
@ -392,16 +403,19 @@ public class yacysearch {
sitehost = sitehost.substring(0, sitehost.length() - 1); sitehost = sitehost.substring(0, sitehost.length() - 1);
} }
sitehash = DigestURI.hosthash(sitehost); sitehash = DigestURI.hosthash(sitehost);
modifier.append("site:").append(sitehost).append(" ");
} }
final int heuristicScroogle = querystring.indexOf("heuristic:scroogle",0); final int heuristicScroogle = querystring.indexOf("/heuristic/scroogle",0);
if (heuristicScroogle >= 0) { if (heuristicScroogle >= 0) {
querystring = querystring.replace("heuristic:scroogle", ""); querystring = querystring.replace("/heuristic/scroogle", "");
modifier.append("/heuristic/scroogle ");
} }
final int heuristicBlekko = querystring.indexOf("heuristic:blekko",0); final int heuristicBlekko = querystring.indexOf("/heuristic/blekko",0);
if (heuristicBlekko >= 0) { if (heuristicBlekko >= 0) {
querystring = querystring.replace("heuristic:blekko", ""); querystring = querystring.replace("/heuristic/blekko", "");
modifier.append("/heuristic/blekko ");
} }
final int authori = querystring.indexOf("author:",0); final int authori = querystring.indexOf("author:",0);
@ -417,6 +431,7 @@ public class yacysearch {
} }
author = querystring.substring(authori + 8, ftb); author = querystring.substring(authori + 8, ftb);
querystring = querystring.replace("author:'" + author + "'", ""); querystring = querystring.replace("author:'" + author + "'", "");
modifier.append("author:'").append(author).append("' ");
} else { } else {
int ftb = querystring.indexOf(' ', authori); int ftb = querystring.indexOf(' ', authori);
if (ftb == -1) { if (ftb == -1) {
@ -424,6 +439,7 @@ public class yacysearch {
} }
author = querystring.substring(authori + 7, ftb); author = querystring.substring(authori + 7, ftb);
querystring = querystring.replace("author:" + author, ""); querystring = querystring.replace("author:" + author, "");
modifier.append("author:").append(author).append(" ");
} }
authorhash = ASCII.String(Word.word2hash(author)); authorhash = ASCII.String(Word.word2hash(author));
} }
@ -435,6 +451,7 @@ public class yacysearch {
} }
String domain = querystring.substring(tld + 4, ftb); String domain = querystring.substring(tld + 4, ftb);
querystring = querystring.replace("tld:" + domain, ""); querystring = querystring.replace("tld:" + domain, "");
modifier.append("tld:").append(domain).append(" ");
while (domain.length() > 0 && domain.charAt(0) == '.') { while (domain.length() > 0 && domain.charAt(0) == '.') {
domain = domain.substring(1); domain = domain.substring(1);
} }
@ -451,7 +468,7 @@ public class yacysearch {
// read the language from the language-restrict option 'lr' // read the language from the language-restrict option 'lr'
// if no one is given, use the user agent or the system language as default // if no one is given, use the user agent or the system language as default
String language = (post == null) ? lr : post.get("lr", lr); language = (post == null) ? language : post.get("lr", language);
if (language.startsWith("lang_")) { if (language.startsWith("lang_")) {
language = language.substring(5); language = language.substring(5);
} }
@ -586,6 +603,7 @@ public class yacysearch {
Word.words2hashesHandles(query[2]), Word.words2hashesHandles(query[2]),
snippetPattern, snippetPattern,
tenant, tenant,
modifier.toString().trim(),
maxDistance, maxDistance,
prefermask, prefermask,
contentdom, contentdom,

28
source/net/yacy/document/ImageParser.java
Unescape View File

@ -7,12 +7,12 @@
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program in the file lgpl21.txt * along with this program in the file lgpl21.txt
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
@ -29,9 +29,9 @@ import net.yacy.document.parser.images.bmpParser;
import net.yacy.document.parser.images.icoParser; import net.yacy.document.parser.images.icoParser;
public class ImageParser { public class ImageParser {
public static final Image parse(final String filename, final byte[] source) { public static final Image parse(final String filename, final byte[] source) {
final MediaTracker mediaTracker = new MediaTracker(new Container()); final MediaTracker mediaTracker = new MediaTracker(new Container());
Image image; Image image;
if (((filename.endsWith(".ico")) || (filename.endsWith(".bmp"))) && (bmpParser.isBMP(source))) { if (((filename.endsWith(".ico")) || (filename.endsWith(".bmp"))) && (bmpParser.isBMP(source))) {
// parse image with BMP parser // parse image with BMP parser
@ -40,8 +40,12 @@ public class ImageParser {
} else if ((filename.endsWith(".ico")) && (icoParser.isICO(source))) { } else if ((filename.endsWith(".ico")) && (icoParser.isICO(source))) {
// parse image with ICO parser // parse image with ICO parser
icoParser icoparser; icoParser icoparser;
icoparser = new icoParser(source); try {
image = icoparser.getImage(0); icoparser = new icoParser(source);
image = icoparser.getImage(0);
} catch (final Throwable e) {
image = null;
}
if (image == null) return null; if (image == null) return null;
} else { } else {
// awt can handle jpg, png and gif formats, try it // awt can handle jpg, png and gif formats, try it
@ -54,19 +58,19 @@ public class ImageParser {
Image i = Toolkit.getDefaultToolkit().createImage(source); Image i = Toolkit.getDefaultToolkit().createImage(source);
mediaTracker.addImage(i, 0); mediaTracker.addImage(i, 0);
try {mediaTracker.waitForID(0);} catch (final InterruptedException ee) {} try {mediaTracker.waitForID(0);} catch (final InterruptedException ee) {}
int width = i.getWidth(null); if (width < 0) width = 96; // bad hack int width = i.getWidth(null); if (width < 0) width = 96; // bad hack
int height = i.getHeight(null); if (height < 0) height = 96; // bad hack int height = i.getHeight(null); if (height < 0) height = 96; // bad hack
image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
image.createGraphics().drawImage(i, 0, 0, width, height, null); image.createGraphics().drawImage(i, 0, 0, width, height, null);
} }
*/ */
} }
final int handle = image.hashCode(); final int handle = image.hashCode();
mediaTracker.addImage(image, handle); mediaTracker.addImage(image, handle);
try {mediaTracker.waitForID(handle);} catch (final InterruptedException e) {} try {mediaTracker.waitForID(handle);} catch (final InterruptedException e) {}
return image; return image;
} }

6
source/net/yacy/peers/Protocol.java
Unescape View File

@ -435,6 +435,7 @@ public final class Protocol {
final Pattern prefer, final Pattern prefer,
final Pattern filter, final Pattern filter,
final Pattern snippet, final Pattern snippet,
final String modifier,
final String language, final String language,
final String sitehash, final String sitehash,
final String authorhash, final String authorhash,
@ -471,7 +472,7 @@ public final class Protocol {
try { try {
result = new SearchResult( result = new SearchResult(
basicRequestParts(Switchboard.getSwitchboard(), target.hash, crypt.randomSalt()), basicRequestParts(Switchboard.getSwitchboard(), target.hash, crypt.randomSalt()),
mySeed, wordhashes, excludehashes, urlhashes, prefer, filter, snippet, language, mySeed, wordhashes, excludehashes, urlhashes, prefer, filter, snippet, modifier, language,
sitehash, authorhash, count, time, maxDistance, global, partitions, target.getHexHash() + ".yacyh", target.getClusterAddress(), sitehash, authorhash, count, time, maxDistance, global, partitions, target.getHexHash() + ".yacyh", target.getClusterAddress(),
secondarySearchSuperviser, rankingProfile, constraint); secondarySearchSuperviser, rankingProfile, constraint);
} catch (final IOException e) { } catch (final IOException e) {
@ -643,6 +644,7 @@ public final class Protocol {
final Pattern prefer, final Pattern prefer,
final Pattern filter, final Pattern filter,
final Pattern snippet, final Pattern snippet,
final String modifier,
final String language, final String language,
final String sitehash, final String sitehash,
final String authorhash, final String authorhash,
@ -694,6 +696,7 @@ public final class Protocol {
parts.put("prefer", UTF8.StringBody(prefer.pattern())); parts.put("prefer", UTF8.StringBody(prefer.pattern()));
parts.put("filter", UTF8.StringBody(filter.pattern())); parts.put("filter", UTF8.StringBody(filter.pattern()));
parts.put("snippet", UTF8.StringBody(snippet.pattern())); parts.put("snippet", UTF8.StringBody(snippet.pattern()));
parts.put("modifier", UTF8.StringBody(modifier));
parts.put("language", UTF8.StringBody(language)); parts.put("language", UTF8.StringBody(language));
parts.put("sitehash", UTF8.StringBody(sitehash)); parts.put("sitehash", UTF8.StringBody(sitehash));
parts.put("authorhash", UTF8.StringBody(authorhash)); parts.put("authorhash", UTF8.StringBody(authorhash));
@ -1157,6 +1160,7 @@ public final class Protocol {
QueryParams.matchnothing_pattern, // prefer, QueryParams.matchnothing_pattern, // prefer,
QueryParams.catchall_pattern, // filter, QueryParams.catchall_pattern, // filter,
QueryParams.catchall_pattern, // snippet, QueryParams.catchall_pattern, // snippet,
"", // modifier
"", // language, "", // language,
"", // sitehash, "", // sitehash,
"", // authorhash, "", // authorhash,

10
source/net/yacy/peers/RemoteSearch.java
Unescape View File

@ -58,6 +58,7 @@ public class RemoteSearch extends Thread {
private final long time; private final long time;
final private RankingProfile rankingProfile; final private RankingProfile rankingProfile;
final private Pattern prefer, filter, snippet; final private Pattern prefer, filter, snippet;
final private QueryParams.Modifier modifier;
final private String language; final private String language;
final private Bitfield constraint; final private Bitfield constraint;
final private SeedDB peers; final private SeedDB peers;
@ -68,6 +69,7 @@ public class RemoteSearch extends Thread {
final Pattern prefer, final Pattern prefer,
final Pattern filter, final Pattern filter,
final Pattern snippet, final Pattern snippet,
final QueryParams.Modifier modifier,
final String language, final String language,
final String sitehash, final String authorhash, final String sitehash, final String authorhash,
final int count, final long time, final int maxDistance, final int count, final long time, final int maxDistance,
@ -89,6 +91,7 @@ public class RemoteSearch extends Thread {
this.prefer = prefer; this.prefer = prefer;
this.filter = filter; this.filter = filter;
this.snippet = snippet; this.snippet = snippet;
this.modifier = modifier;
this.language = language; this.language = language;
this.sitehash = sitehash; this.sitehash = sitehash;
this.authorhash = authorhash; this.authorhash = authorhash;
@ -114,7 +117,7 @@ public class RemoteSearch extends Thread {
this.urls = Protocol.search( this.urls = Protocol.search(
this.peers.mySeed(), this.peers.mySeed(),
this.wordhashes, this.excludehashes, this.urlhashes, this.wordhashes, this.excludehashes, this.urlhashes,
this.prefer, this.filter, this.snippet, this.prefer, this.filter, this.snippet, this.modifier.getModifier(),
this.language, this.sitehash, this.authorhash, this.language, this.sitehash, this.authorhash,
this.count, this.time, this.maxDistance, this.global, this.partitions, this.count, this.time, this.maxDistance, this.global, this.partitions,
this.targetPeer, this.indexSegment, this.containerCache, this.secondarySearchSuperviser, this.targetPeer, this.indexSegment, this.containerCache, this.secondarySearchSuperviser,
@ -156,6 +159,7 @@ public class RemoteSearch extends Thread {
public static RemoteSearch[] primaryRemoteSearches( public static RemoteSearch[] primaryRemoteSearches(
final String wordhashes, final String excludehashes, final String wordhashes, final String excludehashes,
final Pattern prefer, final Pattern filter, final Pattern snippet, final Pattern prefer, final Pattern filter, final Pattern snippet,
final QueryParams.Modifier modifier,
final String language, final String language,
final String sitehash, final String sitehash,
final String authorhash, final String authorhash,
@ -193,7 +197,7 @@ public class RemoteSearch extends Thread {
if (targetPeers[i] == null || targetPeers[i].hash == null) continue; if (targetPeers[i] == null || targetPeers[i].hash == null) continue;
try { try {
searchThreads[i] = new RemoteSearch( searchThreads[i] = new RemoteSearch(
wordhashes, excludehashes, "", prefer, filter, snippet, wordhashes, excludehashes, "", prefer, filter, snippet, modifier,
language, sitehash, authorhash, language, sitehash, authorhash,
count, time, maxDist, true, targets, targetPeers[i], count, time, maxDist, true, targets, targetPeers[i],
indexSegment, peers, containerCache, secondarySearchSuperviser, blacklist, rankingProfile, constraint); indexSegment, peers, containerCache, secondarySearchSuperviser, blacklist, rankingProfile, constraint);
@ -227,7 +231,7 @@ public class RemoteSearch extends Thread {
if (targetPeer == null || targetPeer.hash == null) return null; if (targetPeer == null || targetPeer.hash == null) return null;
if (clusterselection != null) targetPeer.setAlternativeAddress(clusterselection.get(ASCII.getBytes(targetPeer.hash))); if (clusterselection != null) targetPeer.setAlternativeAddress(clusterselection.get(ASCII.getBytes(targetPeer.hash)));
final RemoteSearch searchThread = new RemoteSearch( final RemoteSearch searchThread = new RemoteSearch(
wordhashes, "", urlhashes, QueryParams.matchnothing_pattern, QueryParams.catchall_pattern, QueryParams.catchall_pattern, "", "", "", 20, time, 9999, true, 0, targetPeer, wordhashes, "", urlhashes, QueryParams.matchnothing_pattern, QueryParams.catchall_pattern, QueryParams.catchall_pattern, new QueryParams.Modifier(""), "", "", "", 20, time, 9999, true, 0, targetPeer,
indexSegment, peers, containerCache, null, blacklist, rankingProfile, constraint); indexSegment, peers, containerCache, null, blacklist, rankingProfile, constraint);
searchThread.start(); searchThread.start();
return searchThread; return searchThread;

15
source/net/yacy/search/query/QueryParams.java
Unescape View File

@ -88,6 +88,17 @@ public final class QueryParams {
FETCH_AND_VERIFY_ONLINE; FETCH_AND_VERIFY_ONLINE;
} }
public static class Modifier {
String s;
public Modifier(final String modifier) {
this.s = modifier;
}
public String getModifier() {
return this.s;
}
}
public static final Bitfield empty_constraint = new Bitfield(4, "AAAAAA"); public static final Bitfield empty_constraint = new Bitfield(4, "AAAAAA");
public static final Pattern catchall_pattern = Pattern.compile(".*"); public static final Pattern catchall_pattern = Pattern.compile(".*");
public static final Pattern matchnothing_pattern = Pattern.compile(""); public static final Pattern matchnothing_pattern = Pattern.compile("");
@ -115,6 +126,7 @@ public final class QueryParams {
public final String sitehash; // this is a domain hash, 6 bytes long or null public final String sitehash; // this is a domain hash, 6 bytes long or null
public final String authorhash; public final String authorhash;
public final String tenant; public final String tenant;
public final Modifier modifier;
public Seed remotepeer; public Seed remotepeer;
public final Long time; public final Long time;
// values that are set after a search: // values that are set after a search:
@ -152,6 +164,7 @@ public final class QueryParams {
this.snippetMatcher = QueryParams.catchall_pattern; this.snippetMatcher = QueryParams.catchall_pattern;
this.ranking = ranking; this.ranking = ranking;
this.tenant = null; this.tenant = null;
this.modifier = new Modifier("");
this.maxDistance = Integer.MAX_VALUE; this.maxDistance = Integer.MAX_VALUE;
this.urlMask = catchall_pattern; this.urlMask = catchall_pattern;
this.urlMask_isCatchall = true; this.urlMask_isCatchall = true;
@ -186,6 +199,7 @@ public final class QueryParams {
final HandleSet fullqueryHashes, final HandleSet fullqueryHashes,
final Pattern snippetMatcher, final Pattern snippetMatcher,
final String tenant, final String tenant,
final String modifier,
final int maxDistance, final String prefer, final ContentDomain contentdom, final int maxDistance, final String prefer, final ContentDomain contentdom,
final String language, final String language,
final String navigators, final String navigators,
@ -209,6 +223,7 @@ public final class QueryParams {
this.fullqueryHashes = fullqueryHashes; this.fullqueryHashes = fullqueryHashes;
this.snippetMatcher = snippetMatcher; this.snippetMatcher = snippetMatcher;
this.tenant = (tenant != null && tenant.length() == 0) ? null : tenant; this.tenant = (tenant != null && tenant.length() == 0) ? null : tenant;
this.modifier = new Modifier(modifier == null ? "" : modifier);
this.ranking = ranking; this.ranking = ranking;
this.maxDistance = maxDistance; this.maxDistance = maxDistance;
this.contentdom = contentdom; this.contentdom = contentdom;

1
source/net/yacy/search/query/SearchEvent.java
Unescape View File

@ -134,6 +134,7 @@ public final class SearchEvent {
this.query.prefer, this.query.prefer,
this.query.urlMask, this.query.urlMask,
this.query.snippetMatcher, this.query.snippetMatcher,
this.query.modifier,
this.query.targetlang == null ? "" : this.query.targetlang, this.query.targetlang == null ? "" : this.query.targetlang,
this.query.sitehash == null ? "" : this.query.sitehash, this.query.sitehash == null ? "" : this.query.sitehash,
this.query.authorhash == null ? "" : this.query.authorhash, this.query.authorhash == null ? "" : this.query.authorhash,

Write Preview
Loading…
Cancel
Save