Author: tmortagne
Date: 2007-12-18 16:20:54 +0100 (Tue, 18 Dec 2007)
New Revision: 6403
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/ObjectData.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/TextExtractor.java
Log:
XWIKI-1961: Use the new XWiki.getVirtualWikisDatabaseNames in Lucene plugin
* Also remove one of the two addAttachmentsOfDocument (in IndexRebuilder and
IndexUpdater)
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -22,7 +22,6 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.doc.XWikiAttachment;
import com.xpn.xwiki.doc.XWikiDocument;
-import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.commons.logging.Log;
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -22,7 +22,6 @@
import org.apache.commons.lang.time.FastDateFormat;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
-import org.apache.log4j.Logger;
import java.text.SimpleDateFormat;
import java.util.Date;
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -22,7 +22,6 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.XWiki;
-import com.xpn.xwiki.doc.XWikiAttachment;
import com.xpn.xwiki.doc.XWikiDocument;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,10 +62,9 @@
* for re-addition to the index.
*
* @param context
- * @return total number of documentes and attachments successfully added
to the indexer queue,
+ * @return total number of documents and attachments successfully added to
the indexer queue,
* -1 when errors occured.
- * @throws XWikiException
- * @todo TODO: give more detailed results
+ * TODO: give more detailed results
*/
public int rebuildIndex(XWikiContext context)
{
@@ -117,11 +115,6 @@
String database = context.getDatabase();
- /*
- * XWikiContext wikiContext = new XWikiContext();
wikiContext.setWiki(xwiki);
- * wikiContext.setDatabase(wikiName);
wikiContext.setMainXWiki(context.getMainXWiki());
- */
-
try {
context.setDatabase(wikiName);
@@ -139,9 +132,6 @@
XWikiDocument document;
try {
- // TODO : Retrieve documents by "pack" using "nb, start"
- // XWikiStoreInterface.searchDocuments() parameters. The
actual way to do is too
- // expensive.
document = xwiki.getDocument(docName, context);
} catch (XWikiException e2) {
LOG.error("error fetching document " + wikiName + ":" +
docName);
@@ -153,7 +143,7 @@
indexUpdater.add(document, context);
retval++;
retval += addTranslationsOfDocument(document, context);
- retval += addAttachmentsOfDocument(document, context);
+ retval += indexUpdater.addAttachmentsOfDocument(document,
context);
retval += addObjectsOfDocument(document, context);
} else {
LOG
@@ -187,27 +177,6 @@
/**
* @param document
* @param wikiContext
- */
- private int addAttachmentsOfDocument(XWikiDocument document, XWikiContext
wikiContext)
- {
- int retval = 0;
- final List attachmentList = document.getAttachmentList();
- retval += attachmentList.size();
- for (Iterator attachmentIter = attachmentList.iterator();
attachmentIter.hasNext();) {
- try {
- XWikiAttachment attachment = (XWikiAttachment)
attachmentIter.next();
- indexUpdater.add(document, attachment, wikiContext);
- } catch (Exception e) {
- LOG.error("error retrieving attachment of document " +
document.getFullName(), e);
- }
- }
-
- return retval;
- }
-
- /**
- * @param document
- * @param wikiContext
* @throws XWikiException
*/
protected int addTranslationsOfDocument(XWikiDocument document,
XWikiContext wikiContext)
@@ -244,36 +213,17 @@
*/
private Collection findWikiServers(XWikiContext context)
{
- List retval = new ArrayList();
-
- final String hql =
- ", BaseObject as obj, StringProperty as prop "
- + "where doc.fullName=obj.name and
obj.className='XWiki.XWikiServerClass'"
- + " and prop.id.id = obj.id " + "and prop.id.name = 'server'";
-
- List result = null;
+ List retval = Collections.EMPTY_LIST;
try {
- result = context.getWiki().getStore().searchDocumentsNames(hql,
context);
+ retval = context.getWiki().getVirtualWikisDatabaseNames(context);
+
+ if (!retval.contains(context.getMainXWiki())) {
+ retval.add(context.getMainXWiki());
+ }
} catch (Exception e) {
- LOG.error("error getting list of wiki servers!");
+ LOG.error("error getting list of wiki servers!", e);
}
- if (result != null) {
- for (Iterator iter = result.iterator(); iter.hasNext();) {
- String docname = (String) iter.next();
- if (LOG.isDebugEnabled()) {
- LOG.debug("possible server name: " + docname);
- }
- if (docname.startsWith("XWiki.XWikiServer")) {
-
retval.add(docname.substring("XWiki.XWikiServer".length()).toLowerCase());
- }
- }
- }
-
- if (!retval.contains(context.getMainXWiki())) {
- retval.add(context.getMainXWiki());
- }
-
return retval;
}
}
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/ObjectData.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/ObjectData.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/ObjectData.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -27,7 +27,6 @@
import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.objects.classes.ListItem;
import com.xpn.xwiki.objects.classes.StaticListClass;
-import org.apache.log4j.Logger;
import org.apache.lucene.document.Field;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -21,7 +21,6 @@
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.api.Document;
-import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -20,7 +20,6 @@
package com.xpn.xwiki.plugin.lucene;
import com.xpn.xwiki.api.XWiki;
-import org.apache.log4j.Logger;
import org.apache.lucene.search.Hits;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/TextExtractor.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/TextExtractor.java
2007-12-18 15:12:48 UTC (rev 6402)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/plugin/lucene/TextExtractor.java
2007-12-18 15:20:54 UTC (rev 6403)
@@ -26,7 +26,6 @@
import com.xpn.xwiki.plugin.lucene.textextraction.PDFTextExtractor;
import com.xpn.xwiki.plugin.lucene.textextraction.PlainTextExtractor;
import com.xpn.xwiki.plugin.lucene.textextraction.XmlTextExtractor;
-import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
