use submitted default userAgent if cloning a crawl

This commit is contained in:
Michael Peter Christen 2014-04-30 05:05:02 +02:00
parent e0822fa008
commit a2fba6584f
2 changed files with 9 additions and 3 deletions

View File

@ -450,7 +450,7 @@
</span></span>
<select name="agentName" id="agentName">
#{list}#
<option value="#[name]#">#[name]#</option>
<option value="#[name]#" #(default)#::selected="selected"#(/default)#>#[name]#</option>
#{/list}#
</select>
</dd>

View File

@ -479,8 +479,7 @@ public class CrawlStartExpert {
prop.put("cachePolicy_iffresh", 1);
}
// ---------- Agent name (untested & untouched)
// ---------- Agent name
if (sb.isP2PMode()) {
prop.put("agentSelect", 0);
} else {
@ -496,10 +495,17 @@ public class CrawlStartExpert {
if (sb.isAllIPMode()) {
agentNames.add(ClientIdentification.browserAgentName);
}
String defaultAgentName = agentNames.get(0);
if (post != null && post.containsKey("agentName")) {
String agentName = post.get("agentName", sb.isIntranetMode() ? ClientIdentification.yacyIntranetCrawlerAgentName : ClientIdentification.yacyInternetCrawlerAgentName);
if (agentNames.contains(agentName)) defaultAgentName = agentName;
}
for (int i = 0; i < agentNames.size(); i++) {
prop.put("agentSelect_list_" + i + "_name", agentNames.get(i));
prop.put("agentSelect_list_" + i + "_default", agentNames.get(i).equals(defaultAgentName) ? 1 : 0);
}
prop.put("agentSelect_list", agentNames.size());
}
prop.put("agentSelect_defaultAgentName",
ClientIdentification.yacyInternetCrawlerAgentName);