Skip to content

Commit

Permalink
- added options to switch on/off search domains (text, image, audio, …
Browse files Browse the repository at this point in the history 
…video, app)

- more memory by default


git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6605 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
orbiter committed Jan 21, 2010
1 parent 19ff7da commit 8df1694
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 33 deletions.
7 changes: 7 additions & 0 deletions defaults/yacy.init
View file
Expand Up @@ -702,6 +702,13 @@ indexer.slots = 100
# maximum size of stacker queue
stacker.slots = 2000

# search domains. If set to false then that search is not available
search.text = true
search.images = true
search.audio = true
search.video = true
search.app = true

# number of search results displayed by default
search.items = 10

Expand Down
10 changes: 5 additions & 5 deletions htroot/index.html
View file
Expand Up @@ -30,11 +30,11 @@ <h2 class="yacy">
<!-- <input type="hidden" name="former" value="#[former]#" /> uncommented to detect newsearch //-->
<input type="hidden" name="verify" value="true" />
<div class="yacysearch">
<input type="radio" id="text" name="contentdom" value="text" #(contentdomCheckText)#::checked="checked"#(/contentdomCheckText)# /><label for="text">Text</label>&nbsp;&nbsp;
<input type="radio" id="image" name="contentdom" value="image" #(contentdomCheckImage)#::checked="checked"#(/contentdomCheckImage)# /><label for="image">Images</label>&nbsp;&nbsp;
<input type="radio" id="audio" name="contentdom" value="audio" #(contentdomCheckAudio)#::checked="checked"#(/contentdomCheckAudio)# /><label for="audio">Audio</label>&nbsp;&nbsp;
<input type="radio" id="video" name="contentdom" value="video" #(contentdomCheckVideo)#::checked="checked"#(/contentdomCheckVideo)# /><label for="video">Video</label>&nbsp;&nbsp;
<input type="radio" id="app" name="contentdom" value="app" #(contentdomCheckApp)#::checked="checked"#(/contentdomCheckApp)# /><label for="app">Applications</label>
#(searchtext)#::<input type="radio" id="text" name="contentdom" value="text" #(check)#::checked="checked"#(/check)# /><label for="text">Text</label>&nbsp;&nbsp;#(/searchtext)#
#(searchimage)#::<input type="radio" id="image" name="contentdom" value="image" #(check)#::checked="checked"#(/check)# /><label for="image">Images</label>&nbsp;&nbsp;#(/searchimage)#
#(searchaudio)#::<input type="radio" id="audio" name="contentdom" value="audio" #(check)#::checked="checked"#(/check)# /><label for="audio">Audio</label>&nbsp;&nbsp;#(/searchaudio)#
#(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label>&nbsp;&nbsp;#(/searchvideo)#
#(searchapp)#::<input type="radio" id="app" name="contentdom" value="app" #(check)#::checked="checked"#(/check)# /><label for="app">Applications</label>#(/searchapp)#
</div>
#(searchoptions)#
<input type="hidden" name="maximumRecords" value="#[maximumRecords]#" />
Expand Down
15 changes: 10 additions & 5 deletions htroot/index.java
View file
Expand Up @@ -120,11 +120,16 @@ public static serverObjects respond(final RequestHeader header, final serverObje
prop.put("display", display);
prop.putHTML("constraint", constraint);
prop.put("searchoptions_display", display);
prop.put("contentdomCheckText", (contentdom == ContentDomain.TEXT) ? "1" : "0");
prop.put("contentdomCheckAudio", (contentdom == ContentDomain.AUDIO) ? "1" : "0");
prop.put("contentdomCheckVideo", (contentdom == ContentDomain.VIDEO) ? "1" : "0");
prop.put("contentdomCheckImage", (contentdom == ContentDomain.IMAGE) ? "1" : "0");
prop.put("contentdomCheckApp", (contentdom == ContentDomain.APP) ? "1" : "0");
prop.put("searchtext", sb.getConfigBool("search.text", true) ? 1 : 0);
prop.put("searchaudio", sb.getConfigBool("search.audio", true) ? 1 : 0);
prop.put("searchvideo", sb.getConfigBool("search.video", true) ? 1 : 0);
prop.put("searchimage", sb.getConfigBool("search.image", true) ? 1 : 0);
prop.put("searchapp", sb.getConfigBool("search.app", true) ? 1 : 0);
prop.put("searchtext_check", (contentdom == ContentDomain.TEXT) ? "1" : "0");
prop.put("searchaudio_check", (contentdom == ContentDomain.AUDIO) ? "1" : "0");
prop.put("searchvideo_check", (contentdom == ContentDomain.VIDEO) ? "1" : "0");
prop.put("searchimage_check", (contentdom == ContentDomain.IMAGE) ? "1" : "0");
prop.put("searchapp_check", (contentdom == ContentDomain.APP) ? "1" : "0");
// online caution timing
sb.localSearchLastAccess = System.currentTimeMillis();

Expand Down
19 changes: 7 additions & 12 deletions htroot/yacysearch.html
View file
Expand Up @@ -69,18 +69,13 @@ <h2>#[promoteSearchPageGreeting]#</h2>
<input id="search" name="query" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
<input id="Enter" type="submit" name="Enter" value="Search" />
<div class="yacysearch">
<input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
<label for="text">Text</label>&nbsp;&nbsp;
<input type="radio" id="images" name="contentdom" value="image"#(contentdomCheckImage)#:: checked="checked"#(/contentdomCheckImage)# />
<label for="images">Images</label>&nbsp;&nbsp;
<input type="radio" id="audio" name="contentdom" value="audio"#(contentdomCheckAudio)#:: checked="checked"#(/contentdomCheckAudio)# />
<label for="audio">Audio</label>&nbsp;&nbsp;
<input type="radio" id="video" name="contentdom" value="video"#(contentdomCheckVideo)#:: checked="checked"#(/contentdomCheckVideo)# />
<label for="video">Video</label>&nbsp;&nbsp;
<input type="radio" id="appl" name="contentdom" value="app"#(contentdomCheckApp)#:: checked="checked"#(/contentdomCheckApp)# />
<label for="appl">Applications</label>
&nbsp;
<a href="index.html?display=#[display]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
#(searchtext)#::<input type="radio" id="text" name="contentdom" value="text" #(check)#::checked="checked"#(/check)# /><label for="text">Text</label>&nbsp;&nbsp;#(/searchtext)#
#(searchimage)#::<input type="radio" id="image" name="contentdom" value="image" #(check)#::checked="checked"#(/check)# /><label for="image">Images</label>&nbsp;&nbsp;#(/searchimage)#
#(searchaudio)#::<input type="radio" id="audio" name="contentdom" value="audio" #(check)#::checked="checked"#(/check)# /><label for="audio">Audio</label>&nbsp;&nbsp;#(/searchaudio)#
#(searchvideo)#::<input type="radio" id="video" name="contentdom" value="video" #(check)#::checked="checked"#(/check)# /><label for="video">Video</label>&nbsp;&nbsp;#(/searchvideo)#
#(searchapp)#::<input type="radio" id="app" name="contentdom" value="app" #(check)#::checked="checked"#(/check)# /><label for="app">Applications</label>#(/searchapp)#
&nbsp;
<a href="index.html?display=#[display]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#&amp;meanCount=#[meanCount]#">more options</a>
</div>
<input type="hidden" name="former" value="#[former]#" />
<input type="hidden" name="maximumRecords" value="#[count]#" />
Expand Down
23 changes: 14 additions & 9 deletions htroot/yacysearch.java
View file
Expand Up @@ -202,10 +202,10 @@ public static serverObjects respond(final RequestHeader header, final serverObje
if (clustersearch) global = true; // switches search on, but search target is limited to cluster nodes

// find search domain
final ContentDomain contentdomCode = ContentDomain.contentdomParser((post == null ? "text" : post.get("contentdom", "text")));
final ContentDomain contentdom = ContentDomain.contentdomParser((post == null ? "text" : post.get("contentdom", "text")));

// patch until better search profiles are available
if ((contentdomCode != ContentDomain.TEXT) && (itemsPerPage <= 32)) itemsPerPage = 64;
if ((contentdom != ContentDomain.TEXT) && (itemsPerPage <= 32)) itemsPerPage = 64;

// check the search tracker
TreeSet<Long> trackerHandles = sb.localSearchTracker.get(client);
Expand Down Expand Up @@ -442,7 +442,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
tenant,
maxDistance,
prefermask,
contentdomCode,
contentdom,
language,
navigation,
fetchSnippets,
Expand Down Expand Up @@ -624,7 +624,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
prop.put("results_" + i + "_display", display);
}
prop.put("results", theQuery.displayResults());
prop.put("resultTable", (contentdomCode == ContentDomain.APP || contentdomCode == ContentDomain.AUDIO || contentdomCode == ContentDomain.VIDEO) ? 1 : 0);
prop.put("resultTable", (contentdom == ContentDomain.APP || contentdom == ContentDomain.AUDIO || contentdom == ContentDomain.VIDEO) ? 1 : 0);
prop.put("eventID", theQuery.id(false)); // for bottomline

// process result of search
Expand Down Expand Up @@ -668,11 +668,16 @@ public static serverObjects respond(final RequestHeader header, final serverObje
prop.put("constraint", (constraint == null) ? "" : constraint.exportB64());
prop.put("verify", (fetchSnippets) ? "true" : "false");
prop.put("contentdom", (post == null ? "text" : post.get("contentdom", "text")));
prop.put("contentdomCheckText", (contentdomCode == ContentDomain.TEXT) ? "1" : "0");
prop.put("contentdomCheckAudio", (contentdomCode == ContentDomain.AUDIO) ? "1" : "0");
prop.put("contentdomCheckVideo", (contentdomCode == ContentDomain.VIDEO) ? "1" : "0");
prop.put("contentdomCheckImage", (contentdomCode == ContentDomain.IMAGE) ? "1" : "0");
prop.put("contentdomCheckApp", (contentdomCode == ContentDomain.APP) ? "1" : "0");
prop.put("searchtext", sb.getConfigBool("search.text", true) ? 1 : 0);
prop.put("searchaudio", sb.getConfigBool("search.audio", true) ? 1 : 0);
prop.put("searchvideo", sb.getConfigBool("search.video", true) ? 1 : 0);
prop.put("searchimage", sb.getConfigBool("search.image", true) ? 1 : 0);
prop.put("searchapp", sb.getConfigBool("search.app", true) ? 1 : 0);
prop.put("searchtext_check", (contentdom == ContentDomain.TEXT) ? "1" : "0");
prop.put("searchaudio_check", (contentdom == ContentDomain.AUDIO) ? "1" : "0");
prop.put("searchvideo_check", (contentdom == ContentDomain.VIDEO) ? "1" : "0");
prop.put("searchimage_check", (contentdom == ContentDomain.IMAGE) ? "1" : "0");
prop.put("searchapp_check", (contentdom == ContentDomain.APP) ? "1" : "0");

// for RSS: don't HTML encode some elements
prop.putXML("rss_query", originalquerystring);
Expand Down
2 changes: 1 addition & 1 deletion startYACY.bat
View file
Expand Up @@ -14,7 +14,7 @@ For %%X in (lib/*.jar) Do Call %0 CPGEN lib\%%X
REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced"
set jmx=
set jms=
set javacmd=-Xmx180m -Xms180m
set javacmd=-Xmx250m -Xms250m
set priolvl=10
set priority=/BELOWNORMAL
if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
Expand Down
2 changes: 1 addition & 1 deletion startYACY.sh
View file
Expand Up @@ -159,7 +159,7 @@ then
# JAVA_ARGS="-$i $JAVA_ARGS";
# done
else
JAVA_ARGS="-Xmx180m -Xms180m $JAVA_ARGS";
JAVA_ARGS="-Xmx250m -Xms250m $JAVA_ARGS";
PORT="8080"
fi

Expand Down

0 comments on commit 8df1694

Please sign in to comment.