Changeset 295

Timestamp:

06/22/08 16:24:37 (7 months ago)

Author:

chris

Message:

Fix published clauses in unpublished verses not being displayed
in list of published clauses, or found in searches.

Files:

• lex/trunk/src/com/qwirx/lex/Search.java (modified) (4 diffs)

lex/trunk/src/com/qwirx/lex/Search.java

@@ -14 +14 @@
-import jemdros.FlatStrawConstIterator;
-import jemdros.MatchedObject;
+import jemdros.MonadSetElement;
-import jemdros.SetOfMonads;
-import jemdros.Sheaf;
@@ -92 +93 @@
-        HebrewMorphemeGenerator generator = 
-            new HebrewMorphemeGenerator();
-
+
+
+
+
-        Sheaf sheaf = m_Emdros.getSheaf
-        (
-
-
-
-
+
+
-        );
-        
+        SheafConstIterator sci = sheaf.const_iterator();
+        SetOfMonads clauseMonads = new SetOfMonads();
-        List<ResultBase> resultBases = new ArrayList<ResultBase>();
-        SetOfMonads powerSet = new SetOfMonads();
-        SetOfMonads matchSet = new SetOfMonads();
-        SheafConstIterator sci = sheaf.const_iterator();
-        
-        Map<Integer,ResultBase> clauseIdToBase =
-            new HashMap<Integer,ResultBase>();
-        
-        m_ResultCount = 0;
-        
-        while (sci.hasNext())
-        {
-            Straw straw = sci.next();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        List<SearchResult> results = new ArrayList<SearchResult>();
-
-powerSet
+clauseMonads
-        {
-            return results;
+        }
+
+        // now retrieve the verses
+        
+        Table table = m_Emdros.getTable("SELECT OBJECTS " +
+            "HAVING MONADS IN " + clauseMonads + " [verse]");
+        StringBuffer verseIdList = new StringBuffer();
+        
+        for (TableIterator ti = table.iterator(); ti.hasNext();)
+        {
+            TableRow tr = ti.next();
+            
+            verseIdList.append(tr.getColumn(3));
+
+            if (ti.hasNext())
+            {
+                verseIdList.append(",");
+            }
+        }
+
+        StringBuffer verseMonadsQuery = new StringBuffer("GET MONADS " +
+            "FROM OBJECTS WITH ID_DS = ");
+        verseMonadsQuery.append(verseIdList);
+        verseMonadsQuery.append(" [verse]");
+        
+        table = m_Emdros.getTable(verseMonadsQuery.toString());
+        Map<Integer,SetOfMonads> verseIdToMonadsMap =
+            new HashMap<Integer,SetOfMonads>();
+        
+        for (TableIterator ti = table.iterator(); ti.hasNext();)
+        {
+            TableRow tr = ti.next();
+            int ID_D = Integer.parseInt(tr.getColumn(1));
+            
+            SetOfMonads som = verseIdToMonadsMap.get(new Integer(ID_D));
+            if (som == null)
+            {
+                som = new SetOfMonads();
+                verseIdToMonadsMap.put(new Integer(ID_D), som);
+            }
+            
+            som.add(Integer.parseInt(tr.getColumn(2)),
+                Integer.parseInt(tr.getColumn(3)));
+        }
+
+        StringBuffer verseFeaturesQuery = new StringBuffer("GET FEATURES " +
+            "book, chapter, verse, verse_label FROM OBJECTS WITH ID_DS = ");
+        verseFeaturesQuery.append(verseIdList);
+        verseFeaturesQuery.append(" [verse]");
+        
+        table = m_Emdros.getTable(verseFeaturesQuery.toString());
+
+        for (TableIterator ti = table.iterator(); ti.hasNext();)
+        {
+            TableRow tr = ti.next();
+            int ID_D = Integer.parseInt(tr.getColumn(1));
+            SetOfMonads monads = verseIdToMonadsMap.get(new Integer(ID_D));
+            
+            // TODO fix horribly slow algorithm
+            for (Iterator<ResultBase> i = resultBases.iterator(); i.hasNext();)
+            {
+                ResultBase base = i.next();
+                if (base.monads.part_of(monads))
+                {
+                    base.location = tr.getColumn(5);
+                    base.url = "clause.jsp?book=" + tr.getColumn(2) +
+                        "&amp;chapter=" + tr.getColumn(3) +
+                        "&amp;verse="   + tr.getColumn(4) +
+                        "&amp;clause="  + base.clause.getID_D();
+                }
+            }
-        }
-        
@@ -166 +219 @@
-            }
-            mql += " [clause]";
-Table 
+
-            for (TableIterator ti = table.iterator(); ti.hasNext();)
-            {
@@ -178 +231 @@
-        FlatSheaf flat = m_Emdros.getFlatSheaf(
-            "GET OBJECTS HAVING MONADS IN " +
-powerSet
+clauseMonads
-            "[word GET " +
-            " lexeme, " +