CLI search, step 1

[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..c749a59cdc6e1c1149282a78c6b777ef1f680a2b 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -231,7 +231,11 @@ 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", format(meta.getWords()));
+               } else {
+                       metaDesc.put("Number of words", format(meta.getWords()));
+               }
                metaDesc.put("Source", meta.getSource());
                metaDesc.put("Subject", meta.getSubject());
                metaDesc.put("Language", meta.getLang());
@@ -340,17 +344,27 @@ public abstract class BasicReader implements Reader {
                }
 
                if (proc != null && sync) {
-                       while (proc.isAlive()) {
-                               try {
-                                       Thread.sleep(100);
-                               } catch (InterruptedException e) {
-                               }
+                       try {
+                               proc.waitFor();
+                       } catch (InterruptedException e) {
                        }
                }
        }
 
+       /**
+        * @deprecated use StringUtils when updated
+        */
+       @Deprecated
        static private String format(long value) {
+               //TODO: use StringUtils
+               
                String display = "";
+               String suffix = "";
+
+               if (value > 4000) {
+                       value = value / 1000;
+                       suffix = "k";
+               }
 
                while (value > 0) {
                        if (!display.isEmpty()) {
@@ -360,7 +374,7 @@ public abstract class BasicReader implements Reader {
                        value = value / 1000;
                }
 
-               return display;
+               return display + suffix;
        }
 
        static private String formatDate(String date) {
@@ -373,7 +387,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) {