boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

*) further propagation of display value (see http://forum.yacy-websuche.de/viewtopic.php?f=5&t=1536)

Browse Source 
*) removed another depreciated parameter "time" which led to ugly -UNRESOLVED_PATTERN- in URL

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5285 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
low012 17 years ago
parent 9663e61449
commit 77e41da7d2
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File

7
htroot/ViewFile.html
Unescape View File

@ -5,7 +5,13 @@
#%env/templates/metas.template%#
</head>
<body>
#(display)#
#%env/templates/simpleheader.template%#
::
#%env/templates/header.template%#
::
#%env/templates/embeddedheader.template%#
#(/display)#
<h2>View URL Content</h2>
#(error)#
@ -32,6 +38,7 @@
</dl>
<input type="hidden" name="words" value="#[words]#" />
<input type="hidden" name="urlHash" value="#[hash]#" />
<input type="hidden" name="display" value="#[display]#" />
</fieldset>
</form>
:: <!-- 1 -->

7
htroot/ViewFile.java
Unescape View File

@ -66,7 +66,12 @@ public class ViewFile {
public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
final serverObjects prop = new serverObjects();
final plasmaSwitchboard sb = (plasmaSwitchboard)env;
final plasmaSwitchboard sb = (plasmaSwitchboard)env;
final int display = (post == null) ? 0 : post.getInt("display", 0);
prop.put("display", display);
prop.put("error_display", display);
if (post != null && post.containsKey("words"))
prop.putHTML("error_words", post.get("words"));

3
htroot/index.java
Unescape View File

@ -56,7 +56,8 @@ public class index {
final boolean global = (post == null) ? true : post.get("resource", "global").equals("global");
final boolean authenticated = sb.adminAuthenticated(header) >= 2;
final int display = (post == null) ? 0 : post.getInt("display", 0);
int display = (post == null) ? 0 : post.getInt("display", 0);
if ((display == 1) && (!authenticated)) display = 0;
final int searchoptions = (post == null) ? 0 : post.getInt("searchoptions", 0);
final String former = (post == null) ? "" : post.get("former", "");
final int count = Math.min(100, (post == null) ? 10 : post.getInt("count", 10));

4
htroot/yacysearch.html
Unescape View File

@ -116,11 +116,11 @@ var progressbar = new Progressbar(#[results]#, document.getElementById("results"
<!-- linklist begin -->
#(resultTable)#::<table width="100%"><tr class="TableHeader"><td width="30%">Media</td><td width="70%">URL</tr>#(/resultTable)#
#{results}#
<!--#include virtual="yacysearchitem.html?rss=false&item=#[item]#&eventID=#[eventID]#" -->
<!--#include virtual="yacysearchitem.html?rss=false&item=#[item]#&eventID=#[eventID]#&display=#[display]#" -->
#{/results}#
#(resultTable)#::</table>#(/resultTable)#
<!-- linklist end -->
<!-- attach the bottomline -->
<!--#include virtual="yacysearchitem.html?bottomline=true&eventID=#[eventID]#" -->
<!--#include virtual="yacysearchitem.html?bottomline=true&eventID=#[eventID]#&display=#[display]#" -->
</body>
</html>

1
htroot/yacysearch.java
Unescape View File

@ -383,6 +383,7 @@ public class yacysearch {
for (int i = 0; i < theQuery.displayResults(); i++) {
prop.put("results_" + i + "_item", offset + i);
prop.put("results_" + i + "_eventID", theQuery.id(false));
prop.put("results_" + i + "_display", display);
}
prop.put("results", theQuery.displayResults());
prop.put("resultTable", (contentdomCode <= 1) ? "0" : "1");

4
htroot/yacysearchitem.html
Unescape View File

@ -17,7 +17,7 @@
#(/authorized)#
<p class="snippet"><span class="snippetLoaded" id="h#[urlhash]#">#[snippet]#</span></p>
<p class="url"><a href="#[url]#" id="url#[urlhash]#" target="_parent">#[urlname]#</a></p>
<p class="urlinfo">#[date]# | YBR-#[ybr]# | <a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#">Info</a> | <a href="yacysearch.html?cat=image&amp;url=#[url]#&amp;search=#[former]#">Pictures</a></p>
<p class="urlinfo">#[date]# | YBR-#[ybr]# | <a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#&amp;display=#[display]#">Info</a> | <a href="yacysearch.html?cat=image&amp;url=#[url]#&amp;search=#[former]#&amp;display=#[display]#">Pictures</a></p>
</div>
::
#{items}#
@ -53,7 +53,7 @@
#(/rss)#
#(references)#::
<p><strong>Topwords</strong>:
#{words}#&nbsp;<a href="yacysearch.html?search=#[newsearch]#&amp;Enter=Search&amp;count=#[count]#&amp;offset=#[offset]#&amp;resource=#[resource]#&amp;contentdom=#[contentdom]#&amp;time=#[time]#">#[word]#</a>&nbsp;|#{/words}#
#{words}#&nbsp;<a href="yacysearch.html?search=#[newsearch]#&amp;Enter=Search&amp;count=#[count]#&amp;offset=#[offset]#&amp;resource=#[resource]#&amp;contentdom=#[contentdom]#">#[word]#</a>&nbsp;|#{/words}#
</p>
#(/references)#
#(rssreferences)#::

2
htroot/yacysearchitem.java
Unescape View File

@ -69,6 +69,7 @@ public class yacysearchitem {
final boolean authenticated = sb.adminAuthenticated(header) >= 2;
final int item = post.getInt("item", -1);
final boolean auth = ((String) header.get(httpRequestHeader.CONNECTION_PROP_CLIENTIP, "")).equals("localhost") || sb.verifyAuthentication(header, true);
final int display = (post == null) ? 0 : post.getInt("display", 0);
// default settings for blank item
prop.put("content", "0");
@ -198,6 +199,7 @@ public class yacysearchitem {
prop.put("content_authorized_urlhash", result.hash());
prop.putHTML("content_description", result.title());
prop.putHTML("content_url", result.urlstring());
prop.put("content_display", display);
final int port=result.url().getPort();
yacyURL faviconURL;

Write Preview
Loading…
Cancel
Save