Changeset 299

Timestamp:

06/22/08 20:18:27 (7 months ago)

Author:

chris

Message:

Factor Hebrew glossing morpheme handler out of clause.jsp into its own class.

Change CLM-PERF to CLM-SER2 as requested by Nicolai.

Files:

• lex/trunk/jsp/clause.jsp (modified) (2 diffs)
• lex/trunk/src/com/qwirx/lex/morph/HebrewGlossTableGeneratingMorphemeHandler.java (added)
• lex/trunk/test/com/qwirx/lex/HebrewConverterTest.java (modified) (2 diffs)

lex/trunk/jsp/clause.jsp

@@ -152 +152 @@
-                String predicate_text = "";
-                StringBuffer hebrewText = new StringBuffer();
- morphEdges = new ArrayList
+<MorphEdge> morphEdges = new ArrayList<MorphEdge>
-                HebrewMorphemeGenerator generator = new HebrewMorphemeGenerator();
-                BookData swordVerse = null;
@@ -182 +182 @@
-                                        );
-                                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                                        morphEdges, isFirstWord,
-                                                        !phrases.hasNext() && !words.hasNext());
-                                                
-fc
+mh
-                                        isFirstWord = false;
-                                        
-fc
+mh
-                                        {                               
-                                                hebrewText.append(" ");

lex/trunk/test/com/qwirx/lex/HebrewConverterTest.java

@@ -1 +1 @@
-package com.qwirx.lex;
-
+import java.util.ArrayList;
+import java.util.List;
+
+import jemdros.MatchedObject;
+import jemdros.Sheaf;
+import jemdros.SheafConstIterator;
+import jemdros.Straw;
+import jemdros.StrawConstIterator;
+import junit.framework.TestCase;
+
+import com.qwirx.db.sql.SqlDatabase;
+import com.qwirx.lex.emdros.EmdrosDatabase;
-import com.qwirx.lex.hebrew.HebrewConverter;
-
-
+
+
+
-
-public class HebrewConverterTest extends TestCase
@@ -14 +27 @@
-        assertEquals("îm", HebrewConverter.toTranslit("I92Jm"));
-    }
+    
+    SqlDatabase m_SQL;
+    EmdrosDatabase m_Emdros;
-
+    public void setUp() throws Exception
+    {
+        m_SQL = Lex.getSqlDatabase("test");
+        m_Emdros = Lex.getEmdrosDatabase("test", "test", m_SQL);
+    }
+
+    private List<String[]> getGlossColumns(int clauseId)
+    throws Exception
+    {
+        StringBuffer hebrewText = new StringBuffer();
+        List<String[]> columns = new ArrayList<String[]>();
+        
+        Sheaf sheaf = m_Emdros.getSheaf
+        (
+            "SELECT ALL OBJECTS IN " +
+            "{" + m_Emdros.getMinM() + "-" + m_Emdros.getMaxM() + "} " +
+            "WHERE [clause self = " + clauseId + " " +
+            "       GET logical_struct_id, logical_structure "+
+            "        [phrase GET phrase_type, phrase_function, argument_name, "+
+            "                    type_id, macrorole_number "+
+            "          [word GET lexeme, phrase_dependent_part_of_speech, " +
+            "                    tense, stem, wordnet_gloss, wordnet_synset, " +
+            "                    graphical_preformative, " +
+            "                    graphical_locative, " +
+            "                    graphical_lexeme, " +
+            "                    graphical_pron_suffix, " +
+            "                    graphical_verbal_ending, " +
+            "                    graphical_root_formation, " +
+            "                    graphical_nominal_ending, " +
+            "                    person, number, gender, state, " +
+            "                    surface_consonants, " +
+            "                    suffix_person, suffix_number, suffix_gender " +
+            "          ]"+
+            "        ]"+
+            "      ]"
+        );
+
+        MatchedObject clause = null;
+        SheafConstIterator sci = sheaf.const_iterator();
+        if (sci.hasNext()) 
+        {
+            Straw straw = sci.next();
+            StrawConstIterator swci = straw.const_iterator();
+            if (swci.hasNext()) 
+            {
+                clause = swci.next();
+            }
+        }
+
+        SheafConstIterator phrases = clause.getSheaf().const_iterator();
+        List<MorphEdge> morphEdges = new ArrayList<MorphEdge>();
+        boolean isFirstWord = true;
+        HebrewMorphemeGenerator generator = new HebrewMorphemeGenerator();
+
+        while (phrases.hasNext()) 
+        {
+            MatchedObject phrase =
+                phrases.next().const_iterator().next();
+
+            SheafConstIterator words = phrase.getSheaf().const_iterator();
+            
+            while (words.hasNext()) 
+            {
+                MatchedObject word = words.next().const_iterator().next();
+
+                HebrewGlossTableGeneratingMorphemeHandler hmh = 
+                    new HebrewGlossTableGeneratingMorphemeHandler(
+                        columns, word, hebrewText,
+                        morphEdges, isFirstWord,
+                        !phrases.hasNext() && !words.hasNext());
+                    
+                generator.parse(word, hmh, true, m_SQL);
+            }
+        }
+        
+        return columns;
+    }
+    
+    public void testGloss() throws Exception
+    {
+        List<String[]> columns = getGlossColumns(28951); // Gen 2,24(b)
+        assertEquals("CLM-",  columns.get(0)[1]);
+        assertEquals("SER2-", columns.get(1)[1]);
+
+        columns = getGlossColumns(590946); // IKON11,2(f)
+        assertEquals("P-",    columns.get(0)[1]);
+        assertEquals("3Mpl",  columns.get(1)[1]);
+        assertEquals("",      columns.get(2)[1]);
+        assertEquals("PERF-", columns.get(3)[1]);
+    }
+    
-    public static void main(String[] args)
-    {
-        junit.textui.TestRunner.run(HebrewConverterTest.class);
-    }
-
-}