Riparita 'VortarInformo', iro al v0.3.2 v0.3.2
authorviric@llimona
Sun, 19 Aug 2007 00:31:30 +0200
changeset 45 6d4785558864
parent 44 a6d5f2d98077
child 46 fa817f256aff
Riparita 'VortarInformo', iro al v0.3.2
dicts-src/makepackage
src/jdict/AskWord.java
--- a/dicts-src/makepackage	Sat Aug 18 23:20:10 2007 +0200
+++ b/dicts-src/makepackage	Sun Aug 19 00:31:30 2007 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 BLOCKSIZE=50000
-VER=0.3
+VER=0.3.2
 
 function split_to_dir
 {
--- a/src/jdict/AskWord.java	Sat Aug 18 23:20:10 2007 +0200
+++ b/src/jdict/AskWord.java	Sun Aug 19 00:31:30 2007 +0200
@@ -152,7 +152,7 @@
         {
             ShowText text = new ShowText(
                     /* Versio */
-                    "JDict v0.3 - Vortara programo laŭ stilo dictd " +
+                    "JDict v0.3.2 - Vortara programo laŭ stilo dictd " +
                     "(http://www.dict.org)\n" +
                     "Kopirajto (C) 2007 Lluís Batlle i Rossell\n" +
                     "Tiun ĉi programon mi distribuas laŭ permesilo " +
@@ -166,22 +166,32 @@
         {
             Vector results;
             String text = "";
+            DictDefs defs = new DictDefs(vortaro);
 
             /* Already at start */
-            results = index.SearchDefinition("00databaseinfo", 5);
+            results = index.BinarySearchDefinition("00databaseinfo");
             if (results.size() > 0)
-                text += "Database Info:\n" + (String) results.elementAt(0)
-                    + "\n";
+            {
+                Vorto w = (Vorto) results.elementAt(0);
+                String def = defs.getDefinition(w.getPos(), w.getLength());
+                text += "Database Info:\n" + def + "\n";
+            }
 
-            results = index.SearchDefinition("00databaseshort", 5);
+            results = index.BinarySearchDefinition("00databaseshort");
             if (results.size() > 0)
-                text += "Database Short:\n" + (String) results.elementAt(0)
-                    + "\n";
+            {
+                Vorto w = (Vorto) results.elementAt(0);
+                String def = defs.getDefinition(w.getPos(), w.getLength());
+                text += "Database Short:\n" + def + "\n";
+            }
 
-            results = index.SearchDefinition("00databaseurl", 5);
+            results = index.BinarySearchDefinition("00databaseurl");
             if (results.size() > 0)
-                text += "Database URL:\n" + (String) results.elementAt(0)
-                    + "\n";
+            {
+                Vorto w = (Vorto) results.elementAt(0);
+                String def = defs.getDefinition(w.getPos(), w.getLength());
+                text += "Database URL:\n" + def + "\n";
+            }
 
             ShowText textwin = new ShowText(text, myform);
         }