Changeset 256

Timestamp:

01/04/08 00:20:22 (1 year ago)

Author:

chris

Message:

Changes to clause display, requested by Nicolai.

Files:

• lex/trunk/jsp/clause.jsp (modified) (8 diffs)
• lex/trunk/src/com/qwirx/lex/morph/HebrewMorphemeGenerator.java (modified) (8 diffs)

lex/trunk/jsp/clause.jsp

@@ -107 +107 @@
-                "                    type_id, macrorole_number "+
-                "          [word GET lexeme, phrase_dependent_part_of_speech, " +
-
+stem, 
-                "                    graphical_preformative, " +
-                "                    graphical_locative, " +
@@ -165 +165 @@
-
-                        SheafConstIterator phrases = clause.getSheaf().const_iterator();
+                        boolean isFirstWord = true;
-        
-                        while (phrases.hasNext()) 
@@ -176 +177 @@
-        
-                                SheafConstIterator words = phrase.getSheaf().const_iterator();
+                                
-                                while (words.hasNext()) 
-                                {
@@ -190 +192 @@
-                                                private StringBuffer m_hebrew;
-                                                private List m_morphs;
+                                                boolean m_IsFirstWord, m_IsLastWord;
+                                                boolean m_IsMorpheme;
-                                                
-                                                public HebrewFeatureConverter(TreeNode root,
-                                                        MatchedObject word, StringBuffer hebrew,
-
+
+
-                                                {
-                                                        m_root   = root;
@@ -199 +204 @@
-                                                        m_hebrew = hebrew;
-                                                        m_morphs = morphs;
+                                                        m_IsFirstWord = isFirstWord;
+                                                        m_IsLastWord  = isLastWord;
+                                                }
+                                                
+                                                public boolean isMorpheme()
+                                                {
+                                                        return m_IsMorpheme;
-                                                }
-                                                
@@ -213 +225 @@
-                                                        translit = HebrewConverter.toHtml(translit);
-                                                        if (translit.equals("")) translit = "Ø";
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                                        TreeNode node = m_root.createChild(translit);
@@ -219 +255 @@
-                                                        if (desc == null) desc = "";
-                                                        node.createChild(desc);
+
+                                                        if (lastMorpheme && !m_IsLastWord)
+                                                        {
+                                                                // blank cell between words
+                                                                m_root.createChild("");
+                                                        }
-                                                        
-                                                        m_morphs.add(new MorphEdge(morphNode, 
@@ -227 +269 @@
-                                        HebrewFeatureConverter hfc = 
-                                                new HebrewFeatureConverter(root, word, hebrewText,
-
+
+
-                                                
-                                        generator.parse(word, hfc, true);
-
-
-
+
+
+
+
+
+
+
-                                        if (psp.equals("verb"))
-                                        {

lex/trunk/src/com/qwirx/lex/morph/HebrewMorphemeGenerator.java

@@ -101 +101 @@
-                "lexeme",
-                "tense",
+                "stem",
-            }));
-        }
@@ -131 +132 @@
-            else if (person.equals("unknown"))       person = "";
-            
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-            String state = (String)m_States.get(
-                word.getEMdFValue("state").toString());
+            if      (state.equals("construct")) { state = "CS"; }
+            else if (state.equals("absolute"))  { state = "AB"; }
-            
-            gloss = word.getEMdFValue("wordnet_gloss").getString();
@@ -163 +179 @@
-            
-            verbEnding = person + gender + number;
-"." + 
+
-        }
-        
@@ -169 +185 @@
-        {
-            String tense = null;
+            String stem  = null;
-            
-            if (generateGloss)
-            {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            
@@ -180 +212 @@
-            // String stemNum = word.getEMdFValue("verbal_stem").toString();
-            handler.convert("graphical_root_formation", false,
-"(stem)"
+stem
-            
-            handler.convert("graphical_lexeme", false, gloss, "V/LEX");
@@ -187 +219 @@
-                verbEnding, "V/PGN");
-
-FX
+UFF
-        }
-        else if (psp.equals("noun")
@@ -202 +234 @@
-            handler.convert("graphical_nominal_ending", false,
-                nounEnding, "MARK/N");
-FX
+UFF
-        }
-        else
@@ -218 +250 @@
-            else if (psp.equals("article"))
-            {
-DE
+AR
-            }
-            else if (psp.equals("conjunction"))