X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsearchable%2FFanfiction.java;h=28c0d1be02613d8840f67ce55426ea7c71c98ad8;hp=6814e63648ba933d7c199fe115a8c64fabae747d;hb=74a4396114e66c029534ecb76c6e0f43a0402d3e;hpb=6be5e3bb218e1ed118ad5e693e13d1da2b49df13 diff --git a/src/be/nikiroo/fanfix/searchable/Fanfiction.java b/src/be/nikiroo/fanfix/searchable/Fanfiction.java index 6814e63..28c0d1b 100644 --- a/src/be/nikiroo/fanfix/searchable/Fanfiction.java +++ b/src/be/nikiroo/fanfix/searchable/Fanfiction.java @@ -126,11 +126,11 @@ class Fanfiction extends BasicSearchable { nr = nr.substring(0, nr.length() - 1); } nr = nr.trim(); - - //TODO: fix toNumber/fromNumber + + // TODO: fix toNumber/fromNumber nr = nr.replaceAll("\\.[0-9]*", ""); - - subtag.setCount(toNumber(nr)); + + subtag.setCount(StringUtils.toNumber(nr)); } } } @@ -140,33 +140,6 @@ class Fanfiction extends BasicSearchable { tag.setComplete(true); } - /** - * @deprecated use {@link StringUtils} when updated - */ - @Deprecated - private static long toNumber(String value) { - // TODO: use StringUtils instead after update - long count = 0l; - if (value != null) { - try { - if (value.toLowerCase().endsWith("m")) { - count = Long.parseLong(value.substring(0, - value.length() - 1).trim()); - count *= 1000000; - } else if (value.toLowerCase().endsWith("k")) { - count = Long.parseLong(value.substring(0, - value.length() - 1).trim()); - count *= 1000; - } else { - count = Long.parseLong(value); - } - } catch (NumberFormatException pe) { - } - } - - return count; - } - @Override public List search(String search) throws IOException { String encoded = URLEncoder.encode(search.toLowerCase(), "utf-8"); @@ -190,7 +163,7 @@ class Fanfiction extends BasicSearchable { url += "&p=" + page; } } - + Document doc = load(url, false); // Update the pages number if needed