diff --git a/htroot/ConfigNetwork_p.html b/htroot/ConfigNetwork_p.html index 3ea36c62f..00ce2c64d 100644 --- a/htroot/ConfigNetwork_p.html +++ b/htroot/ConfigNetwork_p.html @@ -48,6 +48,35 @@ #(commitRobinson)#::
For Robinson Mode, index distribution and receive is switched off.
#(/commitRobinson)# #(commitRobinsonWithRemoteIndexing)#::
This Robinson Mode switches remote indexing on, but limits targets to peers within the same cluster. Remote indexing requests from peers within the same cluster are accepted.
#(/commitRobinsonWithRemoteIndexing)# #(commitRobinsonWithoutRemoteIndexing)#::
This Robinson Mode does not allow any remote indexing (neither requests remote indexing, nor accepts it).
#(/commitRobinsonWithoutRemoteIndexing)# +
+
+ + + +

+ YaCy can operate a computing grid of YaCy peers or as a stand-alone node. + To control that all participants within a web indexing domain have access to the same domain, + this network definition must be equal to all members of the same YaCy network. +

+
+
Network Definition
+
#[network.unit.definition]#
+
Network Nick
+
#[network.unit.name]#
+
Long Description
+
#[network.unit.description]#
+
Indexing Domain
+
#[network.unit.domain]#
+
DHT
+
#[network.unit.dht]#
+
+
+
+
+ + + +

You can configure if you want to participate at the global YaCy network or if you want to have your own separate search cluster with or without connection to the global network. You may also define @@ -177,6 +206,7 @@

+ #%env/templates/footer.template%# \ No newline at end of file diff --git a/htroot/ConfigNetwork_p.java b/htroot/ConfigNetwork_p.java index 644535c11..911a3d253 100644 --- a/htroot/ConfigNetwork_p.java +++ b/htroot/ConfigNetwork_p.java @@ -41,6 +41,12 @@ public class ConfigNetwork_p { serverObjects prop = new serverObjects(); int commit = 0; + prop.put("network.unit.definition", sb.getConfig("network.unit.definition", "")); + prop.put("network.unit.name", sb.getConfig("network.unit.name", "")); + prop.put("network.unit.description", sb.getConfig("network.unit.description", "")); + prop.put("network.unit.domain", sb.getConfig("network.unit.domain", "")); + prop.put("network.unit.dht", sb.getConfig("network.unit.dht", "")); + if (post != null) { boolean crawlResponse = post.get("crawlResponse", "off").equals("on"); diff --git a/htroot/ConfigPeerProfile_p.html b/htroot/ConfigPeerProfile_p.html new file mode 100644 index 000000000..4963429d5 --- /dev/null +++ b/htroot/ConfigPeerProfile_p.html @@ -0,0 +1,32 @@ + + + + YaCy '#[clientname]#': Peer Profile + #%env/templates/metas.template%# + + + #%env/templates/header.template%# + #%env/templates/submenuConfig.template%# +

Peer Profile

+

+ This defines visual attributes of the search interfaces. +

+
+
+
+
+
+ +
+
+
+
 
+
+ +
+
+
+
+ #%env/templates/footer.template%# + + diff --git a/htroot/ConfigPeerProfile_p.java b/htroot/ConfigPeerProfile_p.java new file mode 100644 index 000000000..21ea95700 --- /dev/null +++ b/htroot/ConfigPeerProfile_p.java @@ -0,0 +1,47 @@ +// ConfigPeerProfile_p.java +// (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany +// first published 18.04.2008 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 + +import de.anomic.http.httpHeader; +import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.server.serverObjects; +import de.anomic.server.serverSwitch; + +public class ConfigPeerProfile_p { + + public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { + plasmaSwitchboard sb = (plasmaSwitchboard) env; + final serverObjects prop = new serverObjects(); + + if (post != null && post.containsKey("set")) { + sb.setConfig("promoteSearchPageGreeting", post.get("promoteSearchPageGreeting", "")); + } + + prop.putHTML("promoteSearchPageGreeting", sb.getConfig("promoteSearchPageGreeting", "")); + + return prop; + } + +} \ No newline at end of file diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html index 194088184..6bf44636e 100644 --- a/htroot/ConfigProfile_p.html +++ b/htroot/ConfigProfile_p.html @@ -9,10 +9,8 @@ #%env/templates/submenuConfig.template%#

Your Personal Profile

- You can create a personal profile here, which can be seen by other YaCy-members. -

-

- You do not need to provide any personal data here, but if you want to distribute your contact information, you can do that here. + You can create a personal profile here, which can be seen by other YaCy-members + or in the public using a FOAF RDF file.

diff --git a/htroot/env/templates/submenuConfig.template b/htroot/env/templates/submenuConfig.template index 0c8900c64..cd8d25a11 100644 --- a/htroot/env/templates/submenuConfig.template +++ b/htroot/env/templates/submenuConfig.template @@ -3,17 +3,18 @@
diff --git a/source/de/anomic/server/serverFileUtils.java b/source/de/anomic/server/serverFileUtils.java index 278c5c6ac..d512e2e13 100644 --- a/source/de/anomic/server/serverFileUtils.java +++ b/source/de/anomic/server/serverFileUtils.java @@ -389,13 +389,14 @@ public final class serverFileUtils { File tf = new File(file.toString() + "." + (System.currentTimeMillis() % 1000)); pw = new PrintWriter(new BufferedOutputStream(new FileOutputStream(tf))); pw.println("# " + comment); - Iterator> i = props.entrySet().iterator(); String key, value; - Map.Entry entry; - while (i.hasNext()) { - entry = i.next(); + for (Map.Entry entry: props.entrySet()) { key = entry.getKey(); - value = entry.getValue().replaceAll("\n", "\\\\n"); + if (entry.getValue() == null) { + value = ""; + } else { + value = entry.getValue().replaceAll("\n", "\\\\n"); + } pw.println(key + "=" + value); } pw.println("# EOF");