Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Bugfix: changed handling of the query-string to be independent from input-elements

Browse Source 
* removed unnecessary divs

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3571 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
michitux 2007-04-13 18:01:02 +00:00
parent 063063aa0c
commit e917bfcae3
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htroot/js/yacysearch.js
View File

@ -1,6 +1,4 @@
function AllTextSnippets() {
var query = document.getElementsByName("former")[0].value;
function AllTextSnippets(query) {
var span = document.getElementsByTagName("span");
for(var x=0;x<span.length;x++) {
if (span[x].className == 'snippetLoading') {
@ -10,9 +8,7 @@ function AllTextSnippets() {
}
}
function AllMediaSnippets(mediatype) {
var query = document.getElementsByName("former")[0].value;
function AllMediaSnippets(query, mediatype) {
var span = document.getElementsByTagName("span");
for(var x=0;x<span.length;x++) {
if (span[x].className == 'snippetLoading') {
@ -22,9 +18,7 @@ function AllMediaSnippets(mediatype) {
}
}
function AllImageSnippets() {
var query = document.getElementsByName("former")[0].value;
function AllImageSnippets(query) {
var div = document.getElementsByTagName("div");
for(var x=0;x<div.length;x++) {
if (div[x].className == 'snippetLoading') {

12
htroot/yacysearch.html
View File

@ -10,7 +10,7 @@
<script type="text/javascript" src="/js/yacysearch.js"></script>
</head>
<body id="yacysearch" onload="document.getElementById('search').focus()">
<body id="yacysearch"#(input)#:: onload="document.getElementById('search').focus()":: onload="document.getElementById('search').focus()"#(/input)#>
#(display)#
#%env/templates/simpleheader.template%#
@ -23,7 +23,6 @@
#(input)#
::
<form class="search small" action="yacysearch.html" method="get" accept-charset="UTF-8">
<div>
<fieldset class="yacys">
<input id="search" name="search" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
<input id="Enter" type="submit" name="Enter" value="Search" />
@ -41,13 +40,11 @@
<input type="hidden" name="input" value="#[input]#" />
<input type="hidden" name="constraint" value="#[constraint]#" />
</fieldset>
</div>
</form>
::
<form class="search small" action="yacysearch.html" method="get" accept-charset="UTF-8">
<p class="yacylogo"><a href="http://yacy.net/yacy/" class="yacylogo"><img src="/env/grafics/yacy.png" alt="yacy" /></a></p>
<h2>#[promoteSearchPageGreeting]#</h2>
<div class="noborder">
<fieldset class="yacys">
<input id="search" name="search" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
<input id="Enter" type="submit" name="Enter" value="Search" /> &nbsp;
@ -77,7 +74,6 @@
<input type="hidden" name="input" value="#[input]#" />
<input type="hidden" name="constraint" value="#[constraint]#" />
</fieldset>
</div>
</form>
#(/input)#
@ -161,7 +157,7 @@ document.getElementById("Enter").value = "search again - catch up more links";
#{/results}#
<script type="text/javascript">
AllTextSnippets();
AllTextSnippets("#[former]#");
addHover();
</script>
@ -189,7 +185,7 @@ document.getElementById("Enter").value = "search again - catch up more links";
<!-- link end -->
#{/results}#
<script type="text/javascript">
AllMediaSnippets("#[mediatype]#");
AllMediaSnippets("#[mediatype]#", "#[former]#");
addHover();
</script>
@ -202,7 +198,7 @@ document.getElementById("Enter").value = "search again - catch up more links";
<!-- link end -->
#{/results}#
<script type="text/javascript">
AllImageSnippets();
AllImageSnippets("#[former]#");
addHover();
</script>
<!-- linklist end -->

1
htroot/yacysearch.java
View File

@ -510,6 +510,7 @@ public class yacysearch {
prop.put("input_contentdomCheckVideo", (contentdomCode == plasmaSearchQuery.CONTENTDOM_VIDEO) ? 1 : 0);
prop.put("input_contentdomCheckImage", (contentdomCode == plasmaSearchQuery.CONTENTDOM_IMAGE) ? 1 : 0);
prop.put("input_contentdomCheckApp", (contentdomCode == plasmaSearchQuery.CONTENTDOM_APP) ? 1 : 0);
prop.put("type_former", post.get("search", "")); //the query-string used to get the snippets
// return rewrite properties