better handling of seed properties

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4199 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter 2007-11-09 09:40:42 +00:00
parent ecba35de72
commit 0eb60cfe6f
3 changed files with 19 additions and 9 deletions

View File

@ -453,13 +453,13 @@ public class Network {
prop.putNum(STR_TABLE_LIST + conCount + "_lastSeen", /*seed.getLastSeenString() + " " +*/ lastseen); prop.putNum(STR_TABLE_LIST + conCount + "_lastSeen", /*seed.getLastSeenString() + " " +*/ lastseen);
prop.put(STR_TABLE_LIST + conCount + "_utc", seed.get(yacySeed.UTC, "-")); prop.put(STR_TABLE_LIST + conCount + "_utc", seed.get(yacySeed.UTC, "-"));
prop.putHTML(STR_TABLE_LIST + conCount + "_uptime", serverDate.intervalToString(60000 * Long.parseLong(seed.get(yacySeed.UPTIME, "0")))); prop.putHTML(STR_TABLE_LIST + conCount + "_uptime", serverDate.intervalToString(60000 * Long.parseLong(seed.get(yacySeed.UPTIME, "0"))));
prop.putNum(STR_TABLE_LIST + conCount + "_LCount", Long.parseLong(seed.get(yacySeed.LCOUNT, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_LCount", seed.getLong(yacySeed.LCOUNT, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_ICount", Long.parseLong(seed.get(yacySeed.ICOUNT, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_ICount", seed.getLong(yacySeed.ICOUNT, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_RCount", Long.parseLong(seed.get(yacySeed.RCOUNT, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_RCount", seed.getLong(yacySeed.RCOUNT, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_sI", Long.parseLong(seed.get(yacySeed.INDEX_OUT, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_sI", seed.getLong(yacySeed.INDEX_OUT, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_sU", Long.parseLong(seed.get(yacySeed.URL_OUT, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_sU", seed.getLong(yacySeed.URL_OUT, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_rI", Long.parseLong(seed.get(yacySeed.INDEX_IN, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_rI", seed.getLong(yacySeed.INDEX_IN, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_rU", Long.parseLong(seed.get(yacySeed.URL_IN, "0"))); prop.putNum(STR_TABLE_LIST + conCount + "_rU", seed.getLong(yacySeed.URL_IN, 0));
prop.putNum(STR_TABLE_LIST + conCount + "_ppm", PPM); prop.putNum(STR_TABLE_LIST + conCount + "_ppm", PPM);
prop.putNum(STR_TABLE_LIST + conCount + "_qph", Math.round(6000d * QPM) / 100d); prop.putNum(STR_TABLE_LIST + conCount + "_qph", Math.round(6000d * QPM) / 100d);
conCount++; conCount++;

View File

@ -273,7 +273,7 @@ public class yacyPeerActions {
if (disconnectedSeed == null) { if (disconnectedSeed == null) {
dtimeUTC0 = 0; // never disconnected: virtually disconnected maximum time ago dtimeUTC0 = 0; // never disconnected: virtually disconnected maximum time ago
} else { } else {
dtimeUTC0 = Long.parseLong(disconnectedSeed.get("dct", "0")); dtimeUTC0 = disconnectedSeed.getLong("dct", 0);
} }
if (direct) { if (direct) {

View File

@ -330,6 +330,16 @@ public class yacySeed {
return (String) o; return (String) o;
} }
public final long getLong(String key, long dflt) {
final Object o = this.dna.get(key);
if (o == null) { return dflt; }
try {
return Long.parseLong((String) o);
} catch (NumberFormatException e) {
return dflt;
}
}
public final void setIP() { dna.put(yacySeed.IP, ""); } public final void setIP() { dna.put(yacySeed.IP, ""); }
public final void setIP(final String ip) { dna.put(yacySeed.IP, ip); } public final void setIP(final String ip) { dna.put(yacySeed.IP, ip); }
public final void setPort(final String port) { dna.put(yacySeed.PORT, port); } public final void setPort(final String port) { dna.put(yacySeed.PORT, port); }
@ -592,7 +602,7 @@ public class yacySeed {
public final long getLinkCount() { public final long getLinkCount() {
try { try {
return Long.parseLong(get(yacySeed.LCOUNT, yacySeed.ZERO)); return getLong(yacySeed.LCOUNT, 0);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return 0; return 0;
} }