From 005400a13747bca0023e03d7ec0ef0894bb7b8df Mon Sep 17 00:00:00 2001 From: auron_x Date: Mon, 11 Sep 2006 14:41:06 +0000 Subject: [PATCH] *) reverted last commit git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2546 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/yacy.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/source/yacy.java b/source/yacy.java index 43afe8a92..9de684fa6 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -156,17 +156,12 @@ public final class yacy { */ public static String combinedVersionString2PrettyString(String ver) { final Matcher matcher = Pattern.compile("\\A(\\d+\\.\\d{3})(\\d{4}|\\d{5})\\z").matcher(ver); - - String prettyversion = ""; + if (!matcher.find()) { serverLog.logWarning("STARTUP", "Wrong format of version-string: '" + ver + "'. Using default pretty string 'dev/00000' instead"); - //return "dev/00000"; - prettyversion = "dev/00000"; - } - //return (Double.parseDouble(matcher.group(1)) < 0.11 ? "dev" : matcher.group(1)) + "/" + matcher.group(2); - prettyversion = (Double.parseDouble(matcher.group(1)) < 0.11 ? "dev" : matcher.group(1)) + "/" + matcher.group(2); - serverLog.logInfo("STARTUP", "created Pretty version \""+prettyversion+"\" from \""+ver+"\""); - return prettyversion; + return "dev/00000"; + } + return (Double.parseDouble(matcher.group(1)) < 0.11 ? "dev" : matcher.group(1)) + "/" + matcher.group(2); } /**