code cleanup

[fanfix.git] / src / be / nikiroo / fanfix / reader / BasicReader.java

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index 008e4d5bd06c22d3851e1c2b9442a13eb41b2adf..e0970e3ef09621e9f8c582d65fb7e4a2c2afba13 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -231,7 +231,13 @@ public abstract class BasicReader implements Reader {
                metaDesc.put("Publication date", formatDate(meta.getDate()));
                metaDesc.put("Published on", meta.getPublisher());
                metaDesc.put("URL", meta.getUrl());
-               metaDesc.put("Word count", format(meta.getWords()));
+               if (meta.isImageDocument()) {
+                       metaDesc.put("Number of images",
+                                       StringUtils.formatNumber(meta.getWords()));
+               } else {
+                       metaDesc.put("Number of words",
+                                       StringUtils.formatNumber(meta.getWords()));
+               }
                metaDesc.put("Source", meta.getSource());
                metaDesc.put("Subject", meta.getSubject());
                metaDesc.put("Language", meta.getLang());
@@ -340,27 +346,11 @@ public abstract class BasicReader implements Reader {
                }
 
                if (proc != null && sync) {
-                       while (proc.isAlive()) {
-                               try {
-                                       Thread.sleep(100);
-                               } catch (InterruptedException e) {
-                               }
-                       }
-               }
-       }
-
-       static private String format(long value) {
-               String display = "";
-
-               while (value > 0) {
-                       if (!display.isEmpty()) {
-                               display = "." + display;
+                       try {
+                               proc.waitFor();
+                       } catch (InterruptedException e) {
                        }
-                       display = (value % 1000) + display;
-                       value = value / 1000;
                }
-
-               return display;
        }
 
        static private String formatDate(String date) {
@@ -373,7 +363,7 @@ public abstract class BasicReader implements Reader {
 
                if (ms <= 0) {
                        SimpleDateFormat sdf = new SimpleDateFormat(
-                                       "yyyy-MM-dd'T'HH:mm:ssXXX");
+                                       "yyyy-MM-dd'T'HH:mm:ssSSS");
                        try {
                                ms = sdf.parse(date).getTime();
                        } catch (ParseException e) {