diff --git a/htroot/DetailedSearch.java b/htroot/DetailedSearch.java index d2faeb3d2..2597c1e66 100644 --- a/htroot/DetailedSearch.java +++ b/htroot/DetailedSearch.java @@ -119,12 +119,12 @@ public class DetailedSearch { return prop; } - private static void putRanking(serverObjects prop, plasmaSearchRankingProfile rankingProfile, String prefix) { + private static void putRanking(final serverObjects prop, final plasmaSearchRankingProfile rankingProfile, final String prefix) { putRanking(prop, rankingProfile.preToExternalMap(prefix), prefix, "Pre"); putRanking(prop, rankingProfile.postToExternalMap(prefix), prefix, "Post"); } - private static void putRanking(serverObjects prop, Map ranking, String prefix, String attrExtension) { + private static void putRanking(final serverObjects prop, final Map ranking, final String prefix, final String attrExtension) { prop.put("attr" + attrExtension, ranking.size()); Iterator it = ranking.keySet().iterator(); String key; diff --git a/htroot/Surftips.java b/htroot/Surftips.java index 2dff88b15..6d567181b 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -138,9 +138,9 @@ public class Surftips { e.printStackTrace(); } prop.put("surftips_results_" + i + "_recommend", (voted) ? 0 : 1); - prop.put("surftips_results_" + i + "_recommend_negativeVoteLink", "/Surftips.html?voteNegative=" + urlhash + "&refid=" + refid + "&display=" + display + ((showScore) ? "&score=" : "")); // for negaive votes, we don't send around the bad url again, the hash is enough - prop.put("surftips_results_" + i + "_recommend_positiveVoteLink", "/Surftips.html?votePositive=" + urlhash + "&refid=" + refid + "&url=" + crypt.simpleEncode(url,null,'b') + "&title=" + crypt.simpleEncode(title,null,'b') + "&description=" + crypt.simpleEncode(description,null,'b') + "&display=" + display + ((showScore) ? "&score=" : "")); - prop.put("surftips_results_" + i + "_url", url); + prop.put("surftips_results_" + i + "_recommend_negativeVoteLink", "/Surftips.html?voteNegative=" + urlhash + "&refid=" + refid + "&,display=" + display + ((showScore) ? "&score=" : "")); // for negaive votes, we don't send around the bad url again, the hash is enough + prop.put("surftips_results_" + i + "_recommend_positiveVoteLink", "/Surftips.html?votePositive=" + urlhash + "&refid=" + refid + "&url=" + crypt.simpleEncode(url,null,'b') + "&title=" + crypt.simpleEncode(title,null,'b') + "&description=" + crypt.simpleEncode(description,null,'b') + "&display=" + display + ((showScore) ? "&score=" : "")); + prop.put("surftips_results_" + i + "_url", de.anomic.data.wikiCode.replaceHTMLonly(url)); prop.put("surftips_results_" + i + "_urlname", nxTools.shortenURLString(url, 60)); prop.put("surftips_results_" + i + "_urlhash", urlhash); prop.put("surftips_results_" + i + "_title", (showScore) ? ("(" + ranking.getScore(urlhash) + ") " + title) : title); diff --git a/startYACY.sh b/startYACY.sh index 281d05ed1..f23846f78 100755 --- a/startYACY.sh +++ b/startYACY.sh @@ -67,11 +67,25 @@ done java_args="" if [ -f DATA/SETTINGS/httpProxy.conf ] then - for i in `grep javastart DATA/SETTINGS/httpProxy.conf`;do - i="${i#javastart_*=}"; - JAVA_ARGS="-$i $JAVA_ARGS"; + # startup memory + for i in Xmx Xms; do + j=`grep javastart_$i DATA/SETTINGS/httpProxy.conf`; + j="${j#javastart_$i=}"; + if [ -n $j ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi; done + + # Priority + j=`grep javastart_priority DATA/SETTINGS/httpProxy.conf`; + j="${j#javastart_priority=}" + if [ -n $j ]; then JAVA="nice -n $j $JAVA"; fi; + +# for i in `grep javastart DATA/SETTINGS/httpProxy.conf`;do +# i="${i#javastart_*=}"; +# JAVA_ARGS="-$i $JAVA_ARGS"; +# done fi +echo "JAVA_ARGS: $JAVA_ARGS" +echo "JAVA: $JAVA" # generating the proper classpath CLASSPATH=""