Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge origin/master into jetty
- Loading branch information
Showing
17 changed files
with
224 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#[encoded]# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
// seedlist.java | ||
// ----------------------- | ||
// part of YaCy | ||
// (C) by Michael Peter Christen; mc@yacy.net | ||
// first published on http://yacy.net | ||
// Frankfurt, Germany, 2013 | ||
// | ||
// 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.ArrayList; | ||
import java.util.Map; | ||
|
||
import net.yacy.cora.protocol.RequestHeader; | ||
import net.yacy.peers.Seed; | ||
import net.yacy.search.Switchboard; | ||
import net.yacy.server.serverCore; | ||
import net.yacy.server.serverObjects; | ||
import net.yacy.server.serverSwitch; | ||
|
||
/** | ||
* this servlet generates the same file as the principal peers upload to a bootstrap position | ||
* you can call it either with | ||
* http://localhost:8090/yacy/seedlist.html | ||
* or to generate json (or jsonp) with | ||
* http://localhost:8090/yacy/seedlist.json | ||
* http://localhost:8090/yacy/seedlist.json?callback=seedlist | ||
*/ | ||
public final class seedlist { | ||
|
||
private static final int LISTMAX = 1000; | ||
|
||
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { | ||
// return variable that accumulates replacements | ||
final Switchboard sb = (Switchboard) env; | ||
int maxcount = Math.min(LISTMAX, post == null ? Integer.MAX_VALUE : post.getInt("maxcount", Integer.MAX_VALUE)); | ||
final ArrayList<Seed> v = sb.peers.getSeedlist(maxcount, true); | ||
final serverObjects prop = new serverObjects(); | ||
|
||
// write simple-encoded seed lines or json | ||
String EXT = header.get("EXT"); | ||
boolean json = EXT != null && EXT.equals("json"); | ||
|
||
if (json) { | ||
// check for JSONP | ||
if ( post != null && post.containsKey("callback") ) { | ||
prop.put("jsonp-start", post.get("callback") + "(["); | ||
prop.put("jsonp-end", "]);"); | ||
} else { | ||
prop.put("jsonp-start", ""); | ||
prop.put("jsonp-end", ""); | ||
} | ||
// construct json property lists | ||
for (int i = 0; i < v.size(); i++) { | ||
prop.putJSON("peers_" + i + "_map_0_k", Seed.HASH); | ||
prop.putJSON("peers_" + i + "_map_0_v", v.get(i).hash); | ||
prop.put("peers_" + i + "_map_0_c", 1); | ||
Map<String, String> map = v.get(i).getMap(); | ||
int c = 1; | ||
for (Map.Entry<String, String> m: map.entrySet()) { | ||
prop.putJSON("peers_" + i + "_map_" + c + "_k", m.getKey()); | ||
prop.putJSON("peers_" + i + "_map_" + c + "_v", m.getValue()); | ||
prop.put("peers_" + i + "_map_" + c + "_c", 1); | ||
c++; | ||
} | ||
prop.put("peers_" + i + "_map_" + (c - 1) + "_c", 0); | ||
prop.put("peers_" + i + "_map", c); | ||
prop.put("peers_" + i + "_c", i < v.size() - 1 ? 1 : 0); | ||
} | ||
prop.put("peers", v.size()); | ||
} else { | ||
final StringBuilder encoded = new StringBuilder(1024); | ||
for (Seed seed: v) { | ||
encoded.append(seed.genSeedStr(null)).append(serverCore.CRLF_STRING); | ||
} | ||
prop.put("encoded", encoded.toString()); | ||
} | ||
|
||
// return rewrite properties | ||
return prop; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#[jsonp-start]#{ | ||
"peers":[#{peers}#{ | ||
#{map}#"#[k]#":"#[v]#"#(c)#::,#(/c)# | ||
#{/map}#}#(c)#::,#(/c)##{/peers}# | ||
] | ||
}#[jsonp-end]# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.