r1522 - xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-08 14:43:21 +0100 (Wed, 08 Nov 2006)
New Revision: 1522

Modified:
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexRebuilder.java
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexUpdater.java
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/ObjectData.java
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/TextExtractor.java
Log:
index all objects

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexRebuilder.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexRebuilder.java	2006-11-08 11:13:31 UTC (rev 1521)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexRebuilder.java	2006-11-08 13:43:21 UTC (rev 1522)
@@ -140,9 +140,8 @@
      */
     private int addObjectsOfDocument(XWikiDocument document, XWikiContext wikiContext) {
         int retval = 0;
-        BaseObject baseObject = document.getObject("XWiki.ArticleClass");
-        if (baseObject != null) {
-            indexUpdater.add(document, baseObject, wikiContext);
+        if (document.hasElement(XWikiDocument.HAS_OBJECTS)) {
+            indexUpdater.addObject(document, wikiContext);
             retval++;
         }
         return retval;

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexUpdater.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexUpdater.java	2006-11-08 11:13:31 UTC (rev 1521)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/IndexUpdater.java	2006-11-08 13:43:21 UTC (rev 1522)
@@ -383,10 +383,9 @@
 
      /**
      * @param document
-     * @param baseObject
      * @param context 
      */
-    public void add (XWikiDocument document, BaseObject baseObject , XWikiContext context )
+    public void addObject(XWikiDocument document, XWikiContext context )
     {
         queue.add (new ObjectData (document, context));
     }

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/ObjectData.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/ObjectData.java	2006-11-08 11:13:31 UTC (rev 1521)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/ObjectData.java	2006-11-08 13:43:21 UTC (rev 1522)
@@ -79,6 +79,7 @@
     private String getContentAsText(XWikiDocument doc, XWikiContext context) {
         StringBuffer contentText = new StringBuffer();
         try {
+                LOG.info(doc.getFullName());
                 Map objects = doc.getxWikiObjects();
                 Iterator itKey = objects.keySet().iterator();
                 while(itKey.hasNext())  {

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/TextExtractor.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/TextExtractor.java	2006-11-08 11:13:31 UTC (rev 1521)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/net/jkraemer/xwiki/plugins/lucene/TextExtractor.java	2006-11-08 13:43:21 UTC (rev 1522)
@@ -47,7 +47,7 @@
         textExtractors.put ("text/xml", xmlTextExtractor);
         textExtractors.put ("text/plain", new PlainTextExtractor ());
         textExtractors.put ("application/pdf", new PDFTextExtractor ());
-        textExtractors.put ("application/vnd.sun.xml.writer", new OpenOfficeTextExtractor ());
+//        textExtractors.put ("application/vnd.sun.xml.writer", new OpenOfficeTextExtractor ());
         textExtractors.put ("application/msword", new MSWordTextExtractor ());
         textExtractors.put ("application/ms-powerpoint", new MSPowerPointTextExtractor ());
         textExtractors.put ("application/ms-excel", new MSExcelTextExtractor ());