From 1198b9989df436defab6f09581367abe36c13b09 Mon Sep 17 00:00:00 2001 From: orbiter Date: Wed, 10 Mar 2010 15:39:36 +0000 Subject: [PATCH] bugfixes, more sorttable git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6739 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/AccessTracker_p.html | 37 ++++++- htroot/Connections_p.html | 6 +- htroot/Network.html | 4 +- .../yacy/kelondro/data/meta/DigestURI.java | 103 +++++++++++++----- 4 files changed, 114 insertions(+), 36 deletions(-) diff --git a/htroot/AccessTracker_p.html b/htroot/AccessTracker_p.html index 501cd5d8a..ce078ff0c 100644 --- a/htroot/AccessTracker_p.html +++ b/htroot/AccessTracker_p.html @@ -7,6 +7,7 @@ #%env/templates/header.template%# #%env/templates/submenuAccessTracker.template%# + #(page)#

Server Access Overview

This is a list of #[num]# requests to the local http server within the last hour.

@@ -32,7 +33,7 @@ #{/list}#

The following hosts are registered as source for brute-force requests to protected pages

- +
@@ -48,7 +49,7 @@

Server Access Details

This is a list of requests to the local http server within the last hour.

Showing #[num]# requests.

-
Host Access Times
+
@@ -66,7 +67,8 @@

Local Search Log

This is a list of searches that had been requested from this' peer search interface

Showing #[num]# entries from a total of #[total]# requests.

-
Host Date
+
+ @@ -78,6 +80,8 @@ + + #{list}# @@ -91,6 +95,8 @@ #{/list}# + + @@ -102,18 +108,22 @@ +
Requesting Host DateSnippet comp (ms) Query
#[host]##[querystring]#
Ø #[snippettime_avg]#
::

Local Search Host Tracker

This is a list of searches that had been requested from this' peer search interface

Showing #[num]# entries from a total of #[total]# requests.

- +
+ + + #{list}# @@ -122,18 +132,22 @@ #{/list}# + + +
Requesting Host Count Queries Per Last Hour Access Dates
#[host]##{dates}##[date]# #{/dates}#
Σ #[total]# Σ #[qph_sum]#
::

Remote Search Log

This is a list of searches that had been requested from remote peer search interface

Showing #[num]# entries from a total of #[total]# requests.

- +
+ @@ -145,6 +159,8 @@ + + #{list}# @@ -158,6 +174,8 @@ #{/list}# + + @@ -175,12 +193,14 @@
Ø #[snippettime_avg1]# +
Requesting Host Peer NameSnippet comp (ms) Search Word Hashes
#[host]##[queryhashes]#
Total: #[num]#
Success: #[resultcount]#
::

Remote Search Host Tracker

This is a list of searches that had been requested from remote peer search interface

Showing #[num]# entries from a total of #[total]# requests.

- +
+ @@ -188,6 +208,8 @@ + + #{list}# @@ -197,6 +219,8 @@ #{/list}# + + @@ -204,6 +228,7 @@ +
Requesting Host Peer NameQueries Per Last Hour Access Dates
#[host]##{dates}##[date]# #{/dates}#
Σ #[qph_sum]#
#(/page)# #%env/templates/footer.template%# diff --git a/htroot/Connections_p.html b/htroot/Connections_p.html index 6c057642b..9cd846661 100644 --- a/htroot/Connections_p.html +++ b/htroot/Connections_p.html @@ -8,11 +8,11 @@ #%env/templates/header.template%# #%env/templates/submenuAccessTracker.template%# - +

Server Connection Tracking

Incoming Connections

Showing #[numActiveRunning]# active, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.

- +
@@ -37,7 +37,7 @@

Outgoing Connections

Showing #[clientActive]# pooled outgoing connections used as:

-
Protocol Duration
+
diff --git a/htroot/Network.html b/htroot/Network.html index 36be79571..1b581d3c9 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -63,7 +63,7 @@ To see a list of all APIs, please visit the - + @@ -72,7 +72,7 @@ To see a list of all APIs, please visit the Uptime/td> + diff --git a/source/net/yacy/kelondro/data/meta/DigestURI.java b/source/net/yacy/kelondro/data/meta/DigestURI.java index e2f74ecbb..da793cdf2 100644 --- a/source/net/yacy/kelondro/data/meta/DigestURI.java +++ b/source/net/yacy/kelondro/data/meta/DigestURI.java @@ -1058,25 +1058,43 @@ public class DigestURI implements Serializable { public boolean exists() { if (isFile()) return getFSFile().exists(); - if (isSMB()) try {return getSmbFile().exists();} - catch (SmbException e) {return false;} - catch (MalformedURLException e) {return false;} + if (isSMB()) try { + return getSmbFile().exists(); + } 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; } public boolean canRead() { if (isFile()) return getFSFile().canRead(); - if (isSMB()) try {return getSmbFile().canRead();} - catch (SmbException e) {return false;} - catch (MalformedURLException e) {return false;} + if (isSMB()) try { + return getSmbFile().canRead(); + } 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; } public boolean canWrite() { if (isFile()) return getFSFile().canWrite(); - if (isSMB()) try {return getSmbFile().canWrite();} - catch (SmbException e) {return false;} - catch (MalformedURLException e) {return false;} + if (isSMB()) try { + return getSmbFile().canWrite(); + } 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; } @@ -1088,47 +1106,82 @@ public class DigestURI implements Serializable { public boolean isHidden() { if (isFile()) return getFSFile().isHidden(); - if (isSMB()) try {return getSmbFile().isHidden();} - catch (SmbException e) {return false;} - catch (MalformedURLException e) {return false;} + if (isSMB()) try { + return getSmbFile().isHidden(); + } 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; } public boolean isDirectory() { if (isFile()) return getFSFile().isDirectory(); - if (isSMB()) try {return getSmbFile().isDirectory();} - catch (SmbException e) {return false;} - catch (MalformedURLException e) {return false;} + if (isSMB()) try { + return getSmbFile().isDirectory(); + } 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; } public long length() { if (isFile()) return getFSFile().length(); - if (isSMB()) try {return getSmbFile().length();} - catch (SmbException e) {return 0;} - catch (MalformedURLException e) {return 0;} + if (isSMB()) try { + return getSmbFile().length(); + } 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; } public long lastModified() { if (isFile()) return getFSFile().lastModified(); - if (isSMB()) try {return getSmbFile().lastModified();} - catch (SmbException e) {return 0;} - catch (MalformedURLException e) {return 0;} + if (isSMB()) try { + return getSmbFile().lastModified(); + } 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; } public String 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; } public String[] list() { if (isFile()) return getFSFile().list(); - if (isSMB()) try {return getSmbFile().list();} - catch (SmbException e) {return null;} - catch (MalformedURLException e) {return null;} + if (isSMB()) try { + return getSmbFile().list(); + } 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; }
Protocol Duration
send Message/
show Profile/
edit Wiki
q		send Message/
show Profile/
edit Wiki		 Name
 Info Release/
SVN		Uptime Links RWIs URLs for
Remote
Crawl