diff --git a/build.properties b/build.properties index c3ff07c26..6aa6c2d48 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ javacSource=1.4 javacTarget=1.4 # Release Configuration -releaseVersion=0.486 +releaseVersion=0.487 releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr} diff --git a/htroot/DetailedSearch.java b/htroot/DetailedSearch.java index f658e796e..0c613969f 100644 --- a/htroot/DetailedSearch.java +++ b/htroot/DetailedSearch.java @@ -137,7 +137,7 @@ public class DetailedSearch { // do the search plasmaSearchQuery thisSearch = new plasmaSearchQuery(query, wdist, "", count, searchtime, urlmask, ((global) && (yacyonline) && (!(env.getConfig("last-search","").equals(querystring)))) ? plasmaSearchQuery.SEARCHDOM_GLOBALDHT : plasmaSearchQuery.SEARCHDOM_LOCAL, - "", 20); + "", 20, plasmaSearchQuery.catchall_constraint); plasmaSearchRankingProfile localRanking = new plasmaSearchRankingProfile("local", post.toString()); plasmaSearchTimingProfile localTiming = new plasmaSearchTimingProfile(4 * thisSearch.maximumTime / 10, thisSearch.wantedResults); plasmaSearchTimingProfile remoteTiming = new plasmaSearchTimingProfile(6 * thisSearch.maximumTime / 10, thisSearch.wantedResults); diff --git a/htroot/IndexControl_p.java b/htroot/IndexControl_p.java index 6fd6491f3..92d81c537 100644 --- a/htroot/IndexControl_p.java +++ b/htroot/IndexControl_p.java @@ -61,6 +61,7 @@ import de.anomic.index.indexRWIEntry; import de.anomic.plasma.plasmaURL; import de.anomic.index.indexURLEntry; import de.anomic.net.URL; +import de.anomic.plasma.plasmaCondenser; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaWordIndex; import de.anomic.plasma.urlPattern.plasmaURLPattern; @@ -175,7 +176,7 @@ public class IndexControl_p { switchboard.wordIndex.deleteContainer(keyhash); post.remove("keyhashdeleteall"); if (keystring.length() > 0 && - plasmaURL.word2hash(keystring).equals(keyhash)) { + plasmaCondenser.word2hash(keystring).equals(keyhash)) { post.put("keystringsearch", "generated"); } else { post.put("keyhashsearch", "generated"); @@ -198,7 +199,7 @@ public class IndexControl_p { // this shall lead to a presentation of the list; so handle that the remaining program // thinks that it was called for a list presentation post.remove("keyhashdelete"); - if (keystring.length() > 0 && plasmaURL.word2hash(keystring).equals(keyhash)) { + if (keystring.length() > 0 && plasmaCondenser.word2hash(keystring).equals(keyhash)) { post.put("keystringsearch", "generated"); } else { post.put("keyhashsearch", "generated"); @@ -228,7 +229,7 @@ public class IndexControl_p { } if (post.containsKey("keystringsearch")) { - keyhash = plasmaURL.word2hash(keystring); + keyhash = plasmaCondenser.word2hash(keystring); prop.put("keyhash", keyhash); prop.put("urlstring", ""); prop.put("urlhash", ""); @@ -236,7 +237,7 @@ public class IndexControl_p { } if (post.containsKey("keyhashsearch")) { - if (keystring.length() == 0 || !plasmaURL.word2hash(keystring).equals(keyhash)) { + if (keystring.length() == 0 || !plasmaCondenser.word2hash(keystring).equals(keyhash)) { prop.put("keystring", ""); } prop.put("urlstring", ""); @@ -246,7 +247,7 @@ public class IndexControl_p { // transfer to other peer if (post.containsKey("keyhashtransfer")) { - if (keystring.length() == 0 || !plasmaURL.word2hash(keystring).equals(keyhash)) { + if (keystring.length() == 0 || !plasmaCondenser.word2hash(keystring).equals(keyhash)) { prop.put("keystring", ""); } prop.put("urlstring", ""); diff --git a/htroot/IndexCreate_p.java b/htroot/IndexCreate_p.java index a92d513f6..b737083a2 100644 --- a/htroot/IndexCreate_p.java +++ b/htroot/IndexCreate_p.java @@ -59,6 +59,7 @@ import de.anomic.data.wikiCode; import de.anomic.htmlFilter.htmlFilterContentScraper; import de.anomic.htmlFilter.htmlFilterWriter; import de.anomic.http.httpHeader; +import de.anomic.kelondro.kelondroBitfield; import de.anomic.plasma.plasmaURL; import de.anomic.net.URL; import de.anomic.plasma.plasmaCrawlEURL; @@ -68,7 +69,6 @@ import de.anomic.server.serverFileUtils; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.serverThread; -import de.anomic.tools.bitfield; import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacyNewsPool; import de.anomic.yacy.yacyNewsRecord; @@ -204,7 +204,7 @@ public class IndexCreate_p { prop.put("error_reasonString", reasonString); plasmaCrawlEURL.Entry ee = switchboard.urlPool.errorURL.newEntry(crawlingStartURL, null, yacyCore.seedDB.mySeed.hash, yacyCore.seedDB.mySeed.hash, - crawlingStartURL.getHost(), reasonString, new bitfield()); + crawlingStartURL.getHost(), reasonString, new kelondroBitfield()); ee.store(); switchboard.urlPool.errorURL.stackPushEntry(ee); } @@ -282,7 +282,7 @@ public class IndexCreate_p { c++; } else { plasmaCrawlEURL.Entry ee = switchboard.urlPool.errorURL.newEntry(nexturlURL, null, yacyCore.seedDB.mySeed.hash, yacyCore.seedDB.mySeed.hash, - (String) e.getValue(), rejectReason, new bitfield()); + (String) e.getValue(), rejectReason, new kelondroBitfield()); ee.store(); switchboard.urlPool.errorURL.stackPushEntry(ee); } diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template index eb4d42d4c..4d2465b26 100644 --- a/htroot/env/templates/simpleheader.template +++ b/htroot/env/templates/simpleheader.template @@ -1,6 +1,6 @@
    -
  • Peer Administration
    • +
  • Peer Administration
  • Web Search
  • Surftips
  • Peer Owner Profile
    • diff --git a/htroot/htdocsdefault/dir.java b/htroot/htdocsdefault/dir.java index d09d1a01f..e98a34841 100644 --- a/htroot/htdocsdefault/dir.java +++ b/htroot/htdocsdefault/dir.java @@ -62,6 +62,7 @@ import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaURL; import de.anomic.index.indexURLEntry; import de.anomic.kelondro.kelondroBase64Order; +import de.anomic.kelondro.kelondroBitfield; import de.anomic.net.URL; import de.anomic.plasma.plasmaCondenser; import de.anomic.plasma.plasmaSwitchboard; @@ -72,7 +73,6 @@ import de.anomic.server.serverMemory; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.logging.serverLog; -import de.anomic.tools.bitfield; import de.anomic.tools.dirlistComparator; import de.anomic.tools.md5DirFileFilter; import de.anomic.yacy.yacyCore; @@ -375,7 +375,7 @@ public class dir { (long) phrase.length(), // size condenser.RESULT_NUMB_WORDS, // word count plasmaURL.DT_SHARE, // doctype - new bitfield(4), + new kelondroBitfield(4), "**", // language 0,0,0,0,0,0 ); @@ -399,7 +399,7 @@ public class dir { Map.Entry entry; while (words.hasNext()) { entry = (Map.Entry) words.next(); - switchboard.wordIndex.removeEntry(plasmaURL.word2hash((String) entry.getKey()), urlhash, true); + switchboard.wordIndex.removeEntry(plasmaCondenser.word2hash((String) entry.getKey()), urlhash, true); } switchboard.urlPool.loadedURL.remove(urlhash); } catch (Exception e) { diff --git a/htroot/index.html b/htroot/index.html index dcbe10da8..30d0a9df9 100644 --- a/htroot/index.html +++ b/htroot/index.html @@ -29,6 +29,7 @@ +

    more options...

    :: @@ -104,6 +105,14 @@ #(/prefermaskoptions)# + + + Constraints: + + + only index pages + + #(/searchoptions)# diff --git a/htroot/index.java b/htroot/index.java index 41da2df48..165db8bc0 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -108,6 +108,7 @@ public class index { prop.put("searchoptions_urlmaskoptions_urlmaskfilter", ".*"); prop.put("searchoptions_prefermaskoptions", 0); prop.put("searchoptions_prefermaskoptions_prefermaskfilter", ""); + prop.put("searchoptions_indexofChecked", ""); prop.put("results", ""); prop.put("cat", "href"); prop.put("type", "0"); diff --git a/htroot/xml/snippet.java b/htroot/xml/snippet.java index ac08dc0ff..d2d8c5202 100644 --- a/htroot/xml/snippet.java +++ b/htroot/xml/snippet.java @@ -8,6 +8,7 @@ import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaURL; import de.anomic.kelondro.kelondroMSetTools; import de.anomic.net.URL; +import de.anomic.plasma.plasmaCondenser; import de.anomic.plasma.plasmaSearchQuery; import de.anomic.plasma.plasmaSnippetCache; import de.anomic.plasma.plasmaSwitchboard; @@ -37,7 +38,7 @@ public class snippet { } // do the search - Set queryHashes = plasmaSearchQuery.words2hashes(query); + Set queryHashes = plasmaCondenser.words2hashes(query); plasmaSnippetCache.Snippet snippet = switchboard.snippetCache.retrieveSnippet(url, queryHashes, true, 260, 10000); prop.put("status",snippet.getSource()); diff --git a/htroot/yacy/crawlReceipt.java b/htroot/yacy/crawlReceipt.java index 1d573deb5..bc8cc87bc 100644 --- a/htroot/yacy/crawlReceipt.java +++ b/htroot/yacy/crawlReceipt.java @@ -51,13 +51,13 @@ import java.io.IOException; import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaURL; import de.anomic.index.indexURLEntry; +import de.anomic.kelondro.kelondroBitfield; import de.anomic.plasma.plasmaCrawlEURL; import de.anomic.plasma.plasmaCrawlNURL; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.logging.serverLog; -import de.anomic.tools.bitfield; import de.anomic.tools.crypt; import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacySeed; @@ -156,7 +156,7 @@ public final class crawlReceipt { } else { try { plasmaCrawlNURL.Entry en = switchboard.urlPool.noticeURL.getEntry(receivedUrlhash); - plasmaCrawlEURL.Entry ee = switchboard.urlPool.errorURL.newEntry(en.url(), en.referrerHash(), en.initiator(), iam, en.name(), result + ":" + reason, new bitfield()); + plasmaCrawlEURL.Entry ee = switchboard.urlPool.errorURL.newEntry(en.url(), en.referrerHash(), en.initiator(), iam, en.name(), result + ":" + reason, new kelondroBitfield()); ee.store(); switchboard.urlPool.errorURL.stackPushEntry(ee); switchboard.urlPool.noticeURL.remove(receivedUrlhash); diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index 29af5dfe3..7cc7ef885 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -52,6 +52,7 @@ import java.util.Map; import java.util.Set; import de.anomic.http.httpHeader; +import de.anomic.kelondro.kelondroBitfield; import de.anomic.index.indexContainer; import de.anomic.plasma.plasmaURL; import de.anomic.index.indexURLEntry; @@ -93,6 +94,7 @@ public final class search { final String prefer = post.get("prefer", ""); final String filter = post.get("filter", ".*"); final boolean includesnippet = post.get("includesnippet", "false").equals("true"); + final kelondroBitfield constraint = kelondroBitfield(4, post.get("constraint", "______")); // final boolean global = ((String) post.get("resource", "global")).equals("global"); // if true, then result may consist of answers from other peers // Date remoteTime = yacyCore.parseUniversalDate((String) post.get(yacySeed.MYTIME)); // read remote time @@ -131,7 +133,7 @@ public final class search { plasmaSearchQuery squery = null; if ((query.length() == 0) && (abstractSet != null)) { // this is _not_ a normal search, only a request for index abstracts - squery = new plasmaSearchQuery(abstractSet, maxdist, prefer, count, duetime, filter); + squery = new plasmaSearchQuery(abstractSet, maxdist, prefer, count, duetime, filter, plasmaSearchQuery.catchall_constraint); squery.domType = plasmaSearchQuery.SEARCHDOM_LOCAL; yacyCore.log.logInfo("INIT HASH SEARCH (abstracts only): " + squery.anonymizedQueryHashes() + " - " + squery.wantedResults + " links"); @@ -158,7 +160,7 @@ public final class search { prop.put("joincount", 0); } else { // retrieve index containers from search request - squery = new plasmaSearchQuery(keyhashes, maxdist, prefer, count, duetime, filter); + squery = new plasmaSearchQuery(keyhashes, maxdist, prefer, count, duetime, filter, constraint); squery.domType = plasmaSearchQuery.SEARCHDOM_LOCAL; yacyCore.log.logInfo("INIT HASH SEARCH (query-" + abstracts + "): " + squery.anonymizedQueryHashes() + " - " + squery.wantedResults + " links"); @@ -299,4 +301,9 @@ public final class search { return prop; } + private static kelondroBitfield kelondroBitfield(int i, String string) { + // TODO Auto-generated method stub + return null; + } + } \ No newline at end of file diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index d9d314abc..82f0b05b1 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -35,6 +35,7 @@ +