- escaped urls in IndexMonitor

- use <label>s in Performance-pages
- <form accept-charset="ascii">-workaround for utf-8-problems in webforms
- fixed some xhtml problems in yacysearch.html

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3170 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
karlchenofhell 19 years ago
parent d157201e08
commit cf31efec5d

@ -181,7 +181,7 @@ public class IndexMonitor {
prop.put("table_indexed_" + cnt + "_moddate", daydate(urle.moddate())); prop.put("table_indexed_" + cnt + "_moddate", daydate(urle.moddate()));
prop.put("table_indexed_" + cnt + "_wordcount", urle.wordCount()); prop.put("table_indexed_" + cnt + "_wordcount", urle.wordCount());
prop.put("table_indexed_" + cnt + "_urldescr", comp.descr()); prop.put("table_indexed_" + cnt + "_urldescr", comp.descr());
prop.put("table_indexed_" + cnt + "_url", (cachepath == null) ? "-not-cached-" : "<a href=\"CacheAdmin_p.html?action=info&path=" + cachepath + "\" class=\"small\" title=\"" + urlstr + "\">" + urltxt + "</a>"); prop.put("table_indexed_" + cnt + "_url", (cachepath == null) ? "-not-cached-" : "<a href=\"CacheAdmin_p.html?action=info&amp;path=" + cachepath + "\" class=\"small\" title=\"" + de.anomic.data.wikiCode.replaceHTMLonly(urlstr) + "\">" + de.anomic.data.wikiCode.replaceHTMLonly(urltxt) + "</a>");
dark = !dark; dark = !dark;
cnt++; cnt++;
} catch (Exception e) { } catch (Exception e) {

@ -62,10 +62,10 @@
<fieldset> <fieldset>
<legend>Memory Settings</legend> <legend>Memory Settings</legend>
<dl> <dl>
<dt>Maximum used memory</dt> <dt><label for="Xmx">Maximum used memory</label></dt>
<dd><input name="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</dd> <dd><input name="Xmx" id="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</dd>
<dt>Minimal used memory</dt> <dt><label for="Xms">Minimal used memory</label></dt>
<dd><input name="Xms" type="text" size="4" maxlength="4" value="#[Xms]#" /> MByte</dd> <dd><input name="Xms" id="Xms" type="text" size="4" maxlength="4" value="#[Xms]#" /> MByte</dd>
<dt><input type="submit" name="setStartup" value="Set" /></dt> <dt><input type="submit" name="setStartup" value="Set" /></dt>
<dd>Changes take effect after <strong>restart</strong> of YaCy</dd> <dd>Changes take effect after <strong>restart</strong> of YaCy</dd>
</dl> </dl>
@ -77,7 +77,7 @@
<table border="0" cellpadding="2" cellspacing="1"> <table border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader" valign="bottom"> <tr class="TableHeader" valign="bottom">
<td rowspan="2">Database<br />&nbsp;</td> <td rowspan="2">Database<br />&nbsp;</td>
<td rowspan="2">DB&nbsp;Size<br />&nbsp;</td> <td rowspan="2">DB Size<br />&nbsp;</td>
<td colspan="4">Node Cache</td> <td colspan="4">Node Cache</td>
<td colspan="5">Object Cache</td> <td colspan="5">Object Cache</td>
<td colspan="4">Memory Occupation (KBytes)</td> <td colspan="4">Memory Occupation (KBytes)</td>

@ -205,14 +205,11 @@
</table> </table>
</form> </form>
<p>
<strong>YaCy Priority Settings:</strong>
</p>
<form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data"> <form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data">
<fieldset> <fieldset><legend>YaCy Priority Settings</legend>
<dl> <dl>
<dt>YaCy Process Priority:</dt> <dt><label for="priority">YaCy Process Priority</label>:</dt>
<dd><select name="YaCyPriority"> <dd><select id="priority" name="YaCyPriority">
<option value="0"#(priority_normal)#:: selected="selected"#(/priority_normal)#>Normal</option> <option value="0"#(priority_normal)#:: selected="selected"#(/priority_normal)#>Normal</option>
<option value="10"#(priority_below)#:: selected="selected"#(/priority_below)#>Below normal</option> <option value="10"#(priority_below)#:: selected="selected"#(/priority_below)#>Below normal</option>
<option value="20"#(priority_low)#:: selected="selected"#(/priority_low)#>Idle</option> <option value="20"#(priority_low)#:: selected="selected"#(/priority_low)#>Idle</option>
@ -224,25 +221,22 @@
</form> </form>
<p> <p>
<strong>Proxy Performance Settings:</strong> <strong></strong>
</p> </p>
<form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data"> <form action="PerformanceQueues_p.html" method="post" enctype="multipart/form-data">
<table border="0" cellpadding="5" cellspacing="1"> <fieldset><legend>Proxy Performance Settings</legend>
<tr valign="top" class="TableCellDark"> <p>
<td>Online Caution Delay (milliseconds):</td>
<td><input name="onlineCautionDelay" type="text" size="20" maxlength="100" value="#[onlineCautionDelay]#" /></td>
<td>
This is the time that the crawler idles when the proxy is accessed. The delay is extended by this time This is the time that the crawler idles when the proxy is accessed. The delay is extended by this time
each time the proxy is accessed afterwards. This shall improve performance of the proxy throughput. each time the proxy is accessed afterwards. This shall improve performance of the proxy throughput.
(current delta is #[onlineCautionDelayCurrent]# milliseconds since last proxy access.) (current delta is #[onlineCautionDelayCurrent]# milliseconds since last proxy access.)
</td> </p>
</tr> <dl>
<tr valign="top" class="TableCellLight"> <dt><label for="onlineCautionDelay">Online Caution Delay (milliseconds)</label>:</dt>
<td colspan="3"> <dd><input id="onlineCautionDelay" name="onlineCautionDelay" type="text" size="20" maxlength="100" value="#[onlineCautionDelay]#" /></dd>
<input type="submit" name="proxyControlSubmit" value="Enter New Parameters" /> <dt><input type="submit" name="proxyControlSubmit" value="Enter New Parameters" /></dt>
Changes take effect immediately</td> <dd>Changes take effect immediately</dd>
</tr> </dl>
</table> </fieldset>
</form> </form>
#%env/templates/footer.template%# #%env/templates/footer.template%#

@ -16,7 +16,7 @@
#[promoteSearchPageGreeting]# #[promoteSearchPageGreeting]#
</h2> </h2>
<form class="search" action="yacysearch.html" method="get" name="searchform"> <form class="search" action="yacysearch.html" method="get" name="searchform" accept-charset="ascii">
<fieldset class="maininput"> <fieldset class="maininput">
<input type="hidden" name="display" value="#[display]#" /> <input type="hidden" name="display" value="#[display]#" />
<input name="search" id="search" type="text" size="52" maxlength="80" value="#[former]#" /> <input name="search" id="search" type="text" size="52" maxlength="80" value="#[former]#" />

@ -10,7 +10,7 @@
<script type="text/javascript" src="/js/yacysearch.js"></script> <script type="text/javascript" src="/js/yacysearch.js"></script>
</head> </head>
<body id="yacysearch" onload="document.getElementById('search').focus()"> <body id="yacysearch" onload="document.getElementById('SearchInput').focus()">
#(display)# #(display)#
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
@ -18,42 +18,52 @@
#%env/templates/header.template%# #%env/templates/header.template%#
#(/display)# #(/display)#
<form class="search small" name="searchform" action="yacysearch.html" method="get"> <form class="search small" action="yacysearch.html" method="get" accept-charset="ascii">
<p class="yacylogo"><a href="http://yacy.net/yacy/" class="yacylogo"><img src="/env/grafics/yacy.png" alt="yacy" /></a></p> <p class="yacylogo"><a href="http://yacy.net/yacy/" class="yacylogo"><img src="/env/grafics/yacy.png" alt="yacy" /></a></p>
<h2>#[promoteSearchPageGreeting]#</h2> <h2>#[promoteSearchPageGreeting]#</h2>
<fieldset class="maininput"> <fieldset class="maininput">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr><td width="80%"> <tr>
<input name="search" type="text" size="50" maxlength="80" value="#[former]#" onClick='document.searchform.Enter.value = "Search"' /> <td>
<input type="submit" name="Enter" value="Search" /> <input id="SearchInput" name="search" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Search').value = 'Search'" />
</td><td width="20%"> <input id="Search" type="submit" name="Enter" value="Search" />
<a href="index.html?display=#[display]#&searchoptions=1&count=#[count]#&order=#[order]#&resource=#[resource]#&time=#[time]#&urlmaskfilter=#[urlmaskfilter]#&prefermaskfilter=#[prefermaskfilter]#&cat=#[cat]#&type=#[type]#&constraint=#[constraint]#&contentdom=#[contentdom]#&former=#[former]#">more options<a> </td>
</td></tr> <td>
<tr><td width="100%" colspan="2"> <a href="index.html?display=#[display]#&amp;searchoptions=1&amp;count=#[count]#&amp;order=#[order]#&amp;resource=#[resource]#&amp;time=#[time]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;type=#[type]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
<input type="radio" name="contentdom" value="text" #(contentdomCheckText)#::checked="checked"#(/contentdomCheckText)# />Text&nbsp;&nbsp; </td>
<input type="radio" name="contentdom" value="image" #(contentdomCheckImage)#::checked="checked"#(/contentdomCheckImage)# />Images&nbsp;&nbsp; </tr>
<input type="radio" name="contentdom" value="audio" #(contentdomCheckAudio)#::checked="checked"#(/contentdomCheckAudio)# />Audio&nbsp;&nbsp; <tr>
<input type="radio" name="contentdom" value="video" #(contentdomCheckVideo)#::checked="checked"#(/contentdomCheckVideo)# />Video&nbsp;&nbsp; <td colspan="2">
<input type="radio" name="contentdom" value="app" #(contentdomCheckApp)#::checked="checked"#(/contentdomCheckApp)# />Applications <input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
</td></tr> <label for="text">Text</label>&nbsp;&nbsp;
</table> <input type="radio" id="images" name="contentdom" value="image"#(contentdomCheckImage)#:: checked="checked"#(/contentdomCheckImage)# />
<input type="hidden" name="former" value="#[former]#" /> <label for="images">Images</label>&nbsp;&nbsp;
<input type="hidden" name="count" value="#[count]#" /> <input type="radio" id="audio" name="contentdom" value="audio"#(contentdomCheckAudio)#:: checked="checked"#(/contentdomCheckAudio)# />
<input type="hidden" name="order" value="#[order]#" /> <label for="audio">Audio</label>&nbsp;&nbsp;
<input type="hidden" name="resource" value="#[resource]#" /> <input type="radio" id="video" name="contentdom" value="video"#(contentdomCheckVideo)#:: checked="checked"#(/contentdomCheckVideo)# />
<input type="hidden" name="time" value="#[time]#" /> <label for="video">Video</label>&nbsp;&nbsp;
<input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" /> <input type="radio" id="appl" name="contentdom" value="app"#(contentdomCheckApp)#:: checked="checked"#(/contentdomCheckApp)# />
<input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" /> <label for="appl">Applications</label>
<input type="hidden" name="depth" value="#[depth]#" /> </td>
<input type="hidden" name="cat" value="#[cat]#" /> </tr>
<input type="hidden" name="type" value="#[type]#" /> </table>
<input type="hidden" name="display" value="#[display]#" /> <input type="hidden" name="former" value="#[former]#" />
<input type="hidden" name="constraint" value="#[constraint]#" /> <input type="hidden" name="count" value="#[count]#" />
</fieldset> <input type="hidden" name="order" value="#[order]#" />
</form> <input type="hidden" name="resource" value="#[resource]#" />
<input type="hidden" name="time" value="#[time]#" />
<input type="hidden" name="urlmaskfilter" value="#[urlmaskfilter]#" />
<input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
<input type="hidden" name="depth" value="#[depth]#" />
<input type="hidden" name="cat" value="#[cat]#" />
<input type="hidden" name="type" value="#[type]#" />
<input type="hidden" name="display" value="#[display]#" />
<input type="hidden" name="constraint" value="#[constraint]#" />
</fieldset>
</form>
<script type="text/javascript"> <script type="text/javascript">
document.searchform.Enter.value = "search again - catch up more links"; document.getElementById("Search").value = "search again - catch up more links";
</script> </script>
<!-- show information about search key handling --> <!-- show information about search key handling -->

Loading…
Cancel
Save