bugfixes, more sorttable

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6739 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 15 years ago
parent 27b2998eb4
commit 1198b9989d

@ -7,6 +7,7 @@
<body id="AccessTracker"> <body id="AccessTracker">
#%env/templates/header.template%# #%env/templates/header.template%#
#%env/templates/submenuAccessTracker.template%# #%env/templates/submenuAccessTracker.template%#
<script src="/js/sorttable.js"></script>
#(page)# #(page)#
<h2>Server Access Overview</h2> <h2>Server Access Overview</h2>
<p>This is a list of #[num]# requests to the local http server within the last hour.</p> <p>This is a list of #[num]# requests to the local http server within the last hour.</p>
@ -32,7 +33,7 @@
#{/list}# #{/list}#
</table> </table>
<p>The following hosts are registered as source for brute-force requests to protected pages</p> <p>The following hosts are registered as source for brute-force requests to protected pages</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader"> <tr class="TableHeader">
<td>Host</td> <td>Host</td>
<td>Access Times</td> <td>Access Times</td>
@ -48,7 +49,7 @@
<h2>Server Access Details</h2> <h2>Server Access Details</h2>
<p>This is a list of requests to the local http server within the last hour.</p> <p>This is a list of requests to the local http server within the last hour.</p>
<p>Showing #[num]# requests.</p> <p>Showing #[num]# requests.</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader"> <tr class="TableHeader">
<td>Host</td> <td>Host</td>
<td>Date</td> <td>Date</td>
@ -66,7 +67,8 @@
<h2>Local Search Log</h2> <h2>Local Search Log</h2>
<p>This is a list of searches that had been requested from this' peer search interface</p> <p>This is a list of searches that had been requested from this' peer search interface</p>
<p>Showing #[num]# entries from a total of #[total]# requests.</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<thead>
<tr class="TableHeader"> <tr class="TableHeader">
<td>Requesting Host</td> <td>Requesting Host</td>
<td>Date</td> <td>Date</td>
@ -78,6 +80,8 @@
<td>Snippet comp (ms)</td> <td>Snippet comp (ms)</td>
<td>Query</td> <td>Query</td>
</tr> </tr>
</thead>
<tbody>
#{list}# #{list}#
<tr class="TableCell#(dark)#Light::Dark#(/dark)#"> <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
<td>#[host]#</td> <td>#[host]#</td>
@ -91,6 +95,8 @@
<td><a href="/yacysearch.html?search=#[querystring]#&resource=local">#[querystring]#</a></td> <td><a href="/yacysearch.html?search=#[querystring]#&resource=local">#[querystring]#</a></td>
</tr> </tr>
#{/list}# #{/list}#
</tbody>
<tfoot>
<tr class="TableHeader"> <tr class="TableHeader">
<td></td> <td></td>
<td></td> <td></td>
@ -102,18 +108,22 @@
<td>&#216; #[snippettime_avg]#</td> <td>&#216; #[snippettime_avg]#</td>
<td></td> <td></td>
</tr> </tr>
</tfoot>
</table> </table>
:: ::
<h2>Local Search Host Tracker</h2> <h2>Local Search Host Tracker</h2>
<p>This is a list of searches that had been requested from this' peer search interface</p> <p>This is a list of searches that had been requested from this' peer search interface</p>
<p>Showing #[num]# entries from a total of #[total]# requests.</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<thead>
<tr class="TableHeader"> <tr class="TableHeader">
<td>Requesting Host</td> <td>Requesting Host</td>
<td>Count</td> <td>Count</td>
<td>Queries Per Last Hour</td> <td>Queries Per Last Hour</td>
<td>Access Dates</td> <td>Access Dates</td>
</tr> </tr>
</thead>
<tbody>
#{list}# #{list}#
<tr class="TableCell#(dark)#Light::Dark#(/dark)#"> <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
<td>#[host]#</td> <td>#[host]#</td>
@ -122,18 +132,22 @@
<td>#{dates}##[date]# #{/dates}#</td> <td>#{dates}##[date]# #{/dates}#</td>
</tr> </tr>
#{/list}# #{/list}#
</tbody>
<tfoot>
<tr class="TableHeader"> <tr class="TableHeader">
<td></td> <td></td>
<td>&#931; #[total]#</td> <td>&#931; #[total]#</td>
<td>&#931; #[qph_sum]#</td> <td>&#931; #[qph_sum]#</td>
<td></td> <td></td>
</tr> </tr>
</tfoot>
</table> </table>
:: ::
<h2>Remote Search Log</h2> <h2>Remote Search Log</h2>
<p>This is a list of searches that had been requested from remote peer search interface</p> <p>This is a list of searches that had been requested from remote peer search interface</p>
<p>Showing #[num]# entries from a total of #[total]# requests.</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<thead>
<tr class="TableHeader"> <tr class="TableHeader">
<td>Requesting Host</td> <td>Requesting Host</td>
<td>Peer Name</td> <td>Peer Name</td>
@ -145,6 +159,8 @@
<td>Snippet comp (ms)</td> <td>Snippet comp (ms)</td>
<td>Search Word Hashes</td> <td>Search Word Hashes</td>
</tr> </tr>
</thead>
<tbody>
#{list}# #{list}#
<tr class="TableCell#(dark)#Light::Dark#(/dark)#"> <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
<td>#[host]#</td> <td>#[host]#</td>
@ -158,6 +174,8 @@
<td>#[queryhashes]#</td> <td>#[queryhashes]#</td>
</tr> </tr>
#{/list}# #{/list}#
</tbody>
<tfoot>
<tr class="TableHeader"> <tr class="TableHeader">
<td>Total: #[num]# <td>Total: #[num]#
<br/>Success: #[resultcount]#</td> <br/>Success: #[resultcount]#</td>
@ -175,12 +193,14 @@
<br/>&#216; #[snippettime_avg1]#</td> <br/>&#216; #[snippettime_avg1]#</td>
<td></td> <td></td>
</tr> </tr>
</tfoot>
</table> </table>
:: ::
<h2>Remote Search Host Tracker</h2> <h2>Remote Search Host Tracker</h2>
<p>This is a list of searches that had been requested from remote peer search interface</p> <p>This is a list of searches that had been requested from remote peer search interface</p>
<p>Showing #[num]# entries from a total of #[total]# requests.</p> <p>Showing #[num]# entries from a total of #[total]# requests.</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<thead>
<tr class="TableHeader"> <tr class="TableHeader">
<td>Requesting Host</td> <td>Requesting Host</td>
<td>Peer Name</td> <td>Peer Name</td>
@ -188,6 +208,8 @@
<td>Queries Per Last Hour</td> <td>Queries Per Last Hour</td>
<td>Access Dates</td> <td>Access Dates</td>
</tr> </tr>
</thead>
<tbody>
#{list}# #{list}#
<tr class="TableCell#(dark)#Light::Dark#(/dark)#"> <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
<td>#[host]#</td> <td>#[host]#</td>
@ -197,6 +219,8 @@
<td>#{dates}##[date]# #{/dates}#</td> <td>#{dates}##[date]# #{/dates}#</td>
</tr> </tr>
#{/list}# #{/list}#
</tbody>
<tfoot>
<tr class="TableHeader"> <tr class="TableHeader">
<td></td> <td></td>
<td></td> <td></td>
@ -204,6 +228,7 @@
<td>&#931; #[qph_sum]#</td> <td>&#931; #[qph_sum]#</td>
<td></td> <td></td>
</tr> </tr>
</tfoot>
</table> </table>
#(/page)# #(/page)#
#%env/templates/footer.template%# #%env/templates/footer.template%#

@ -8,11 +8,11 @@
<body id="Connections"> <body id="Connections">
#%env/templates/header.template%# #%env/templates/header.template%#
#%env/templates/submenuAccessTracker.template%# #%env/templates/submenuAccessTracker.template%#
<script src="/js/sorttable.js"></script>
<h2>Server Connection Tracking</h2> <h2>Server Connection Tracking</h2>
<h3>Incoming Connections</h3> <h3>Incoming Connections</h3>
<p>Showing #[numActiveRunning]# active, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.</p> <p>Showing #[numActiveRunning]# active, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader" valign="bottom"> <tr class="TableHeader" valign="bottom">
<td>Protocol</td> <td>Protocol</td>
<td>Duration</td> <td>Duration</td>
@ -37,7 +37,7 @@
<h3>Outgoing Connections</h3> <h3>Outgoing Connections</h3>
<p>Showing #[clientActive]# pooled outgoing connections used as:</p> <p>Showing #[clientActive]# pooled outgoing connections used as:</p>
<table border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader" valign="bottom"> <tr class="TableHeader" valign="bottom">
<td>Protocol</td> <td>Protocol</td>
<td>Duration</td> <td>Duration</td>

@ -63,7 +63,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
</form> </form>
<table class="sortable" border="0" cellpadding="2" cellspacing="1"> <table class="sortable" border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader" valign="bottom"> <tr class="TableHeader" valign="bottom">
<td>send&nbsp;<strong>M</strong>essage/<br />show&nbsp;<strong>P</strong>rofile/<br />edit&nbsp;<strong>W</strong>iki<br />q</td> <td>send&nbsp;<strong>M</strong>essage/<br />show&nbsp;<strong>P</strong>rofile/<br />edit&nbsp;<strong>W</strong>iki</td>
<td><strong>Name</strong><br /></td> <td><strong>Name</strong><br /></td>
<td style="width:44px;"><strong>Info</strong></td> <td style="width:44px;"><strong>Info</strong></td>
<td><strong>Release/<br />SVN</strong></td> <td><strong>Release/<br />SVN</strong></td>
@ -72,7 +72,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<td><strong>Last<br />Seen</strong></td> <td><strong>Last<br />Seen</strong></td>
<td><strong>UTC</strong><br />Offset</td> <td><strong>UTC</strong><br />Offset</td>
<td><strong>Location</strong><br /></td> <td><strong>Location</strong><br /></td>
<td style="width:70px;"><strong>Uptime</strong>/td> <td style="width:70px;"><strong>Uptime</strong></td>
<td><strong>Links</strong></td> <td><strong>Links</strong></td>
<td><strong>RWIs</strong></td> <td><strong>RWIs</strong></td>
<td><strong>URLs for<br />Remote<br />Crawl</strong></td> <td><strong>URLs for<br />Remote<br />Crawl</strong></td>

@ -1058,25 +1058,43 @@ public class DigestURI implements Serializable {
public boolean exists() { public boolean exists() {
if (isFile()) return getFSFile().exists(); if (isFile()) return getFSFile().exists();
if (isSMB()) try {return getSmbFile().exists();} if (isSMB()) try {
catch (SmbException e) {return false;} return getSmbFile().exists();
catch (MalformedURLException e) {return false;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.exists SmbException for " + this.toString() + ": " + e.getMessage());
return false;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.exists MalformedURLException for " + this.toString() + ": " + e.getMessage());
return false;
}
return false; return false;
} }
public boolean canRead() { public boolean canRead() {
if (isFile()) return getFSFile().canRead(); if (isFile()) return getFSFile().canRead();
if (isSMB()) try {return getSmbFile().canRead();} if (isSMB()) try {
catch (SmbException e) {return false;} return getSmbFile().canRead();
catch (MalformedURLException e) {return false;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.canRead SmbException for " + this.toString() + ": " + e.getMessage());
return false;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.canRead MalformedURLException for " + this.toString() + ": " + e.getMessage());
return false;
}
return false; return false;
} }
public boolean canWrite() { public boolean canWrite() {
if (isFile()) return getFSFile().canWrite(); if (isFile()) return getFSFile().canWrite();
if (isSMB()) try {return getSmbFile().canWrite();} if (isSMB()) try {
catch (SmbException e) {return false;} return getSmbFile().canWrite();
catch (MalformedURLException e) {return false;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.canWrite SmbException for " + this.toString() + ": " + e.getMessage());
return false;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.canWrite MalformedURLException for " + this.toString() + ": " + e.getMessage());
return false;
}
return false; return false;
} }
@ -1088,47 +1106,82 @@ public class DigestURI implements Serializable {
public boolean isHidden() { public boolean isHidden() {
if (isFile()) return getFSFile().isHidden(); if (isFile()) return getFSFile().isHidden();
if (isSMB()) try {return getSmbFile().isHidden();} if (isSMB()) try {
catch (SmbException e) {return false;} return getSmbFile().isHidden();
catch (MalformedURLException e) {return false;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.isHidden SmbException for " + this.toString() + ": " + e.getMessage());
return false;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.isHidden MalformedURLException for " + this.toString() + ": " + e.getMessage());
return false;
}
return false; return false;
} }
public boolean isDirectory() { public boolean isDirectory() {
if (isFile()) return getFSFile().isDirectory(); if (isFile()) return getFSFile().isDirectory();
if (isSMB()) try {return getSmbFile().isDirectory();} if (isSMB()) try {
catch (SmbException e) {return false;} return getSmbFile().isDirectory();
catch (MalformedURLException e) {return false;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.isDirectory SmbException for " + this.toString() + ": " + e.getMessage());
return false;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.isDirectory MalformedURLException for " + this.toString() + ": " + e.getMessage());
return false;
}
return false; return false;
} }
public long length() { public long length() {
if (isFile()) return getFSFile().length(); if (isFile()) return getFSFile().length();
if (isSMB()) try {return getSmbFile().length();} if (isSMB()) try {
catch (SmbException e) {return 0;} return getSmbFile().length();
catch (MalformedURLException e) {return 0;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.length SmbException for " + this.toString() + ": " + e.getMessage());
return 0;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.length MalformedURLException for " + this.toString() + ": " + e.getMessage());
return 0;
}
return 0; return 0;
} }
public long lastModified() { public long lastModified() {
if (isFile()) return getFSFile().lastModified(); if (isFile()) return getFSFile().lastModified();
if (isSMB()) try {return getSmbFile().lastModified();} if (isSMB()) try {
catch (SmbException e) {return 0;} return getSmbFile().lastModified();
catch (MalformedURLException e) {return 0;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.lastModified SmbException for " + this.toString() + ": " + e.getMessage());
return 0;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.lastModified MalformedURLException for " + this.toString() + ": " + e.getMessage());
return 0;
}
return 0; return 0;
} }
public String getName() { public String getName() {
if (isFile()) return getFSFile().getName(); if (isFile()) return getFSFile().getName();
if (isSMB()) try {return getSmbFile().getName();} catch (MalformedURLException e) {return null;} if (isSMB()) try {
return getSmbFile().getName();
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.getName MalformedURLException for " + this.toString() + ": " + e.getMessage());
return null;
}
return null; return null;
} }
public String[] list() { public String[] list() {
if (isFile()) return getFSFile().list(); if (isFile()) return getFSFile().list();
if (isSMB()) try {return getSmbFile().list();} if (isSMB()) try {
catch (SmbException e) {return null;} return getSmbFile().list();
catch (MalformedURLException e) {return null;} } catch (SmbException e) {
Log.logWarning("DigestURI", "SMB.list SmbException for " + this.toString() + ": " + e.getMessage());
return null;
} catch (MalformedURLException e) {
Log.logWarning("DigestURI", "SMB.list MalformedURLException for " + this.toString() + ": " + e.getMessage());
return null;
}
return null; return null;
} }

Loading…
Cancel
Save