Mostly work on Link spans, and upgrade the manfiest to 4.0.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / HtmlEntry.java

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index 8ff40e362ec13ee0dc43075d722b267d89c6985c..4143fd34477221bd543f5438d6951492f3f0d62c 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -1,5 +1,10 @@
 package com.hughes.android.dictionary.engine;
 
+import android.content.Intent;
+import android.net.Uri;
+
+import com.hughes.android.dictionary.C;
+import com.hughes.util.StringUtil;
 import com.hughes.util.raf.RAFListSerializer;
 import com.hughes.util.raf.RAFSerializable;
 import com.ibm.icu.text.Transliterator;
@@ -7,12 +12,16 @@ import com.ibm.icu.text.Transliterator;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.regex.Pattern;
 
 public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntry>, Comparable<HtmlEntry> {
   
-  // Both are HTML escaped already.
+  // Title is not HTML escaped.
   public final String title;
   public String html;
   
@@ -24,13 +33,23 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
   public HtmlEntry(Dictionary dictionary, RandomAccessFile raf, final int index) throws IOException {
     super(dictionary, raf, index);
     title = raf.readUTF();
-    html = raf.readUTF();
+
+    final byte[] bytes = new byte[raf.readInt()];
+    final byte[] zipBytes = new byte[raf.readInt()];
+    raf.read(zipBytes);
+    StringUtil.unzipFully(zipBytes, bytes);
+    html = new String(bytes, "UTF-8");
   }
   @Override
   public void write(RandomAccessFile raf) throws IOException {
     super.write(raf);
     raf.writeUTF(title);
-    raf.writeUTF(html);
+
+    final byte[] bytes = html.getBytes("UTF-8");
+    final byte[] zipBytes = StringUtil.zipBytes(bytes);
+    raf.writeInt(bytes.length);
+    raf.writeInt(zipBytes.length);
+    raf.write(zipBytes);
   }
 
   @Override
@@ -112,7 +131,7 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
     @Override
     public void print(PrintStream out) {
       final HtmlEntry entry = getEntry();
-      out.println("HtmlEntry (shortened): " + entry.title);
+      out.println("See also HtmlEntry:" + entry.title);
     }
 
     @Override
@@ -135,15 +154,39 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
       }
       return RowMatchType.BAG_OF_WORDS_MATCH;
     }
-    
   }
 
-    public static String htmlBody(final List<HtmlEntry> htmlEntries) {
+    public static String htmlBody(final List<HtmlEntry> htmlEntries, final String indexShortName) {
         final StringBuilder result = new StringBuilder();
         for (final HtmlEntry htmlEntry : htmlEntries) {
-            result.append(String.format("<h1>%s</h1>%s\n", htmlEntry.title, htmlEntry.html));
+            final String titleEscaped = StringUtil.escapeToPureHtmlUnicode(htmlEntry.title);
+            result.append(String.format("<h1><a href=\"%s\">%s</a></h1>\n(%s)\n<p>%s\n", 
+                    formatQuickdicUrl(indexShortName, titleEscaped), titleEscaped, htmlEntry.entrySource.name,
+                    htmlEntry.html));
         }
         return result.toString();
     }
+    
+    public static String formatQuickdicUrl(final String indexShortName, final String text) {
+        assert !indexShortName.contains(":");
+        assert text.length() > 0;
+        try {
+            return String.format("qd:%s:%s", indexShortName, URLEncoder.encode(text, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static boolean isQuickdicUrl(String url) {
+        return url.startsWith("qd:");
+    }
+    
+    public static void quickdicUrlToIntent(final String url, final Intent intent) {
+        int firstColon = url.indexOf(":");
+        if (firstColon == -1) return;
+        int secondColon = url.indexOf(":", firstColon + 1);
+        if (secondColon == -1) return;
+        intent.putExtra(C.SEARCH_TOKEN, Uri.decode(url.substring(secondColon + 1)));
+    }
 
 }