diff --git a/htroot/CrawlProfileEditor_p.java b/htroot/CrawlProfileEditor_p.java
index a24e8f9e3..ab1eb894b 100644
--- a/htroot/CrawlProfileEditor_p.java
+++ b/htroot/CrawlProfileEditor_p.java
@@ -138,7 +138,7 @@ public class CrawlProfileEditor_p {
tee = (eentry) it.next();
String cval = (String) selentry.map().get(tee.name);
String val = (tee.type == eentry.BOOLEAN) ? Boolean.toString(post.containsKey(tee.name)) : post.get(tee.name, cval);
- if (!cval.equals(val)) selentry.changeEntry(tee.name, val);
+ if (!cval.equals(val)) sb.profiles.changeEntry(selentry, tee.name, val);
}
} catch (IOException ex) {
prop.put("error", 1);
diff --git a/htroot/DetailedSearch.html b/htroot/DetailedSearch.html
deleted file mode 100644
index 25746082e..000000000
--- a/htroot/DetailedSearch.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
- YaCy '#[clientname]#': Detailed Search
- #%env/templates/metas.template%#
-
-
- #%env/templates/header.template%#
- Detailed Search
- #(num-results)#
- ::
- #[linkcount]# results from #[orderedcount]# ordered links from #[filteredcount]# filtered links of a total number of #[totalcount]# known.
- #(/num-results)#
-
-
-
- #(type)#
- #(excluded)#
- ::
- The following words are stop-words and had been excluded from the search: #[stopwords]#.
- #(/excluded)#
- #(combine)#
- ::
- Topwords (to refine search):
- #{words}#
- #[word]#
- #{/words}#
-
- #(/combine)#
-
- #{results}#
-
-
- #(authorized)#::
-
-
-
- #(/authorized)#
-
- #(snippet)#::
#[text]#
#(/snippet)#
-
#[urlname]#
-
#[date]# | YBR-#[ybr]# | Info
-
#[rankingprops]#
-
Ranking Configuration
+
+
+ #%env/templates/footer.template%#
+
+
diff --git a/htroot/Ranking_p.java b/htroot/Ranking_p.java
new file mode 100644
index 000000000..a362894b3
--- /dev/null
+++ b/htroot/Ranking_p.java
@@ -0,0 +1,167 @@
+// Ranking_p.java
+// --------------
+// (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
+// first published 05.02.2006 on http://yacy.net
+//
+// This is a part of YaCy, a peer-to-peer based web search engine
+//
+// $LastChangedDate: 2007-07-19 22:11:48 +0000 (Do, 19 Jul 2007) $
+// $LastChangedRevision: 3995 $
+// $LastChangedBy: orbiter $
+//
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import de.anomic.http.httpHeader;
+import de.anomic.plasma.plasmaSearchRankingProfile;
+import de.anomic.plasma.plasmaSwitchboard;
+import de.anomic.server.serverObjects;
+import de.anomic.server.serverSwitch;
+import de.anomic.tools.crypt;
+
+public class Ranking_p {
+
+ private static final int maxRankingRange = 16;
+
+ private static final HashMap rankingParameters = new HashMap();
+ static {
+ rankingParameters.put(plasmaSearchRankingProfile.APPAUTHOR, "Appearance In Author");
+ rankingParameters.put(plasmaSearchRankingProfile.APPDESCR, "Appearance In Description");
+ rankingParameters.put(plasmaSearchRankingProfile.APPEMPH, "Appearance In Emphasized Text");
+ rankingParameters.put(plasmaSearchRankingProfile.APPREF, "Appearance In Reference");
+ rankingParameters.put(plasmaSearchRankingProfile.APPTAGS, "Appearance In Tags");
+ rankingParameters.put(plasmaSearchRankingProfile.APPURL, "Appearance In URL");
+ rankingParameters.put(plasmaSearchRankingProfile.CATHASAPP, "Category App, Appearance");
+ rankingParameters.put(plasmaSearchRankingProfile.CATHASAUDIO, "Category Audio Appearance");
+ rankingParameters.put(plasmaSearchRankingProfile.CATHASIMAGE, "Category Image Appearance");
+ rankingParameters.put(plasmaSearchRankingProfile.CATHASVIDEO, "Category Video Appearance");
+ rankingParameters.put(plasmaSearchRankingProfile.CATINDEXOF, "Category Index Page");
+ rankingParameters.put(plasmaSearchRankingProfile.DATE, "Date");
+ rankingParameters.put(plasmaSearchRankingProfile.DESCRCOMPINTOPLIST, "Description Comp. Appears In Toplist");
+ rankingParameters.put(plasmaSearchRankingProfile.DOMLENGTH, "Domain Length");
+ rankingParameters.put(plasmaSearchRankingProfile.HITCOUNT, "Hit Count");
+ rankingParameters.put(plasmaSearchRankingProfile.LLOCAL, "Links To Local Domain");
+ rankingParameters.put(plasmaSearchRankingProfile.LOTHER, "Links To Other Domain");
+ rankingParameters.put(plasmaSearchRankingProfile.PHRASESINTEXT, "Phrases In Text");
+ rankingParameters.put(plasmaSearchRankingProfile.POSINTEXT, "Position In Text");
+ rankingParameters.put(plasmaSearchRankingProfile.POSOFPHRASE, "Position Of Phrase");
+ rankingParameters.put(plasmaSearchRankingProfile.PREFER, "Application Of Prefer Pattern");
+ rankingParameters.put(plasmaSearchRankingProfile.URLCOMPINTOPLIST, "URL Component Appears In Toplist");
+ rankingParameters.put(plasmaSearchRankingProfile.URLCOMPS, "URL Components");
+ rankingParameters.put(plasmaSearchRankingProfile.URLLENGTH, "URL Length");
+ rankingParameters.put(plasmaSearchRankingProfile.WORDDISTANCE, "Word Distance");
+ rankingParameters.put(plasmaSearchRankingProfile.WORDSINTEXT, "Words In Text");
+ rankingParameters.put(plasmaSearchRankingProfile.WORDSINTITLE, "Words In Title");
+ rankingParameters.put(plasmaSearchRankingProfile.YBR, "YaCy Block Rank");
+ }
+
+ private static serverObjects defaultValues() {
+ final serverObjects prop = new serverObjects();
+ prop.put("search", "");
+ prop.put("num-results", 0);
+ prop.put("excluded", 0);
+ prop.put("combine", 0);
+ prop.put("resultbottomline", 0);
+ prop.put("localCount", 10);
+ prop.put("localWDist", 999);
+ //prop.put("globalChecked", "checked");
+ prop.put("globalChecked", 0);
+ prop.put("postsortChecked", 1);
+ prop.put("localTime", 6);
+ prop.put("results", "");
+ prop.put("urlmaskoptions", 0);
+ prop.put("urlmaskoptions_urlmaskfilter", ".*");
+ prop.put("jumpToCursor", 1);
+ return prop;
+ }
+
+ private static void putRanking(serverObjects prop, plasmaSearchRankingProfile rankingProfile, String prefix) {
+ putRanking(prop, rankingProfile.preToExternalMap(prefix), prefix, "Pre");
+ putRanking(prop, rankingProfile.postToExternalMap(prefix), prefix, "Post");
+ }
+
+ private static void putRanking(serverObjects prop, Map map, String prefix, String attrExtension) {
+ prop.put("attr" + attrExtension, map.size());
+ Iterator it = map.keySet().iterator();
+ String key;
+ int i, j = 0;
+ while (it.hasNext()) {
+ key = (String)it.next();
+ prop.put("attr" + attrExtension + "_" + j + "_name", rankingParameters.get(key.substring(prefix.length())));
+ prop.put("attr" + attrExtension + "_" + j + "_nameorg", key);
+ prop.put("attr" + attrExtension + "_" + j + "_select", maxRankingRange);
+ for (i=0; iSearch & Browse
diff --git a/source/de/anomic/plasma/plasmaCrawlProfile.java b/source/de/anomic/plasma/plasmaCrawlProfile.java
index 089b22d00..b4e8352b9 100644
--- a/source/de/anomic/plasma/plasmaCrawlProfile.java
+++ b/source/de/anomic/plasma/plasmaCrawlProfile.java
@@ -58,8 +58,9 @@ import de.anomic.server.serverCodings;
public class plasmaCrawlProfile {
+ private static HashMap domsCache = new HashMap();
+
private kelondroMapObjects profileTable;
- private HashMap domsCache;
private File profileTableFile;
private long preloadTime;
@@ -71,7 +72,6 @@ public class plasmaCrawlProfile {
profileTableFile.getParentFile().mkdirs();
kelondroDyn dyn = new kelondroDyn(profileTableFile, true, true, preloadTime, crawlProfileHandleLength, 2000, '#', kelondroNaturalOrder.naturalOrder, true, false, true);
profileTable = new kelondroMapObjects(dyn, 500);
- domsCache = new HashMap();
}
private void resetDatabase() {
@@ -208,8 +208,13 @@ public class plasmaCrawlProfile {
if (m == null) return null;
return new entry(m);
}
+
+ public void changeEntry(entry e, String propName, String newValue) throws IOException {
+ e.mem.put(propName, newValue);
+ profileTable.set(e.handle(), e.mem);
+ }
- public class DomProfile {
+ public static class DomProfile {
public String referrer;
public int depth, count;
@@ -226,7 +231,7 @@ public class plasmaCrawlProfile {
}
- public class entry {
+ public static class entry {
// this is a simple record structure that hold all properties of a single crawl start
public static final String HANDLE = "handle";
@@ -413,10 +418,6 @@ public class plasmaCrawlProfile {
String r = (String) mem.get(XPSTOPW);
if (r == null) return false; else return (r.equals(Boolean.TRUE.toString()));
}
- public void changeEntry(String propName, String newValue) throws IOException {
- mem.put(propName, newValue);
- profileTable.set(handle(), mem);
- }
public void domInc(String domain, String referrer, int depth) {
synchronized (domain.intern()) {
DomProfile dp = (DomProfile) doms.get(domain);
diff --git a/source/de/anomic/urlRedirector/urlRedirectord.java b/source/de/anomic/urlRedirector/urlRedirectord.java
index 8c0ae5388..4a36021de 100644
--- a/source/de/anomic/urlRedirector/urlRedirectord.java
+++ b/source/de/anomic/urlRedirector/urlRedirectord.java
@@ -152,7 +152,7 @@ public class urlRedirectord implements serverHandler {
if (pos != -1) {
String newDepth = line.substring(pos).trim();
this.theLogger.logFine("Changing crawling depth to '" + newDepth + "'.");
- profile.changeEntry("generalDepth",newDepth);
+ switchboard.profiles.changeEntry(profile, "generalDepth",newDepth);
}
outputWriter.print("\r\n");
outputWriter.flush();
@@ -161,7 +161,7 @@ public class urlRedirectord implements serverHandler {
if (pos != -1) {
String newValue = line.substring(pos).trim();
this.theLogger.logFine("Changing crawl dynamic setting to '" + newValue + "'");
- profile.changeEntry("crawlingQ",newValue);
+ switchboard.profiles.changeEntry(profile, "crawlingQ",newValue);
}
outputWriter.print("\r\n");
outputWriter.flush();
diff --git a/source/de/anomic/xml/rssReader.java b/source/de/anomic/xml/rssReader.java
index 711175922..313f9408d 100644
--- a/source/de/anomic/xml/rssReader.java
+++ b/source/de/anomic/xml/rssReader.java
@@ -1,3 +1,29 @@
+// rssReader.java
+// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
+// first published 16.07.2007 on http://yacy.net
+//
+// This is a part of YaCy, a peer-to-peer based web search engine
+//
+// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
+// $LastChangedRevision: 1986 $
+// $LastChangedBy: orbiter $
+//
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
package de.anomic.xml;
import java.io.InputStream;