Added cxapelitajn
authorviric@llimona
Tue, 24 Jul 2007 23:53:15 +0200
changeset 6 8637861fe332
parent 5 104f2d53fa8d
child 7 6c7f46ab89f6
Added cxapelitajn
dicts-src/install
src/jdict/AskWord.java
src/jdict/Replace.java
--- a/dicts-src/install	Tue Jul 24 23:36:34 2007 +0200
+++ b/dicts-src/install	Tue Jul 24 23:53:15 2007 +0200
@@ -5,21 +5,7 @@
 for a in `ls *.index`; do
     NAME=`basename $a .index`
 
-    sed -e '
-    s/ĉ/cx/g;
-    s/ĥ/hx/g;
-    s/ŝ/sx/g;
-    s/ĵ/jx/g;
-    s/ŭ/ux/g;
-    s/ĝ/gx/g;
-    s/Ĉ/Cx/g;
-    s/Ĥ/Hx/g;
-    s/Ŝ/Sx/g;
-    s/Ĵ/Jx/g;
-    s/Ŭ/Ux/g;
-    s/Ĝ/Gx/g;' < $NAME.index > t-$NAME.index
-    split -b $SIZE -d t-$NAME.index x-$NAME.index
-    rm t-$NAME.index
+    split -b $SIZE -d $NAME.index x-$NAME.index
     mv x-$NAME.index* ../src/dicts
 
     split -b $SIZE -d $NAME.dict x-$NAME.dict
--- a/src/jdict/AskWord.java	Tue Jul 24 23:36:34 2007 +0200
+++ b/src/jdict/AskWord.java	Tue Jul 24 23:53:15 2007 +0200
@@ -13,6 +13,14 @@
 	
 	public AskWord()
 	{
+        String in, out;
+        in = "hola";
+        out = Replace.replace_sub(in, "ho", "pa");
+        System.out.println("in: " + in + " out: " + out);
+        in = "sxargxo";
+        out = Replace.replace_sub(in, "gx", "ĝ");
+        System.out.println("in: " + in + " out: " + out);
+
 		show();
 	}
 
@@ -44,7 +52,10 @@
             DictIndex index = new DictIndex("alos-eo-ca");
 
             Vector results;
-            results = index.SearchDefinition(word.getString());
+            String toSearch = Replace.IksojAlCxapeloj(word.getString());
+
+            System.out.println("Serĉante: " + toSearch);
+            results = index.SearchDefinition(toSearch);
 
             Results resultsform = new Results(results, myform);
         }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdict/Replace.java	Tue Jul 24 23:53:15 2007 +0200
@@ -0,0 +1,41 @@
+package jdict;
+
+public class Replace
+{
+	public static String replace_sub(String original, String from, String to)
+	{
+        String result = "";
+        int lastcopy = 0;
+        int index = 0;
+        int change;
+
+        while ( (change = original.indexOf(from, index)) != -1)
+        {
+            String part = original.substring(lastcopy, change);
+            result += part + to;
+            lastcopy = change + from.length();
+            index = lastcopy;
+        }
+
+        result += original.substring(lastcopy, original.length());
+        return result;
+	}
+
+    public static String IksojAlCxapeloj(String original)
+    {
+        String result = original;
+        result = replace_sub(result, "cx", "ĉ");
+        result = replace_sub(result, "gx", "ĝ");
+        result = replace_sub(result, "hx", "ĥ");
+        result = replace_sub(result, "jx", "ĵ");
+        result = replace_sub(result, "sx", "ŝ");
+        result = replace_sub(result, "ux", "ŭ");
+        result = replace_sub(result, "Cx", "Ĉ");
+        result = replace_sub(result, "Gx", "Ĝ");
+        result = replace_sub(result, "Hx", "Ĥ");
+        result = replace_sub(result, "Jx", "Ĵ");
+        result = replace_sub(result, "Sx", "Ŝ");
+        result = replace_sub(result, "Ux", "Ŭ");
+        return result;
+    }
+}