After looking at Apachesolr recently, I was inspired to do some more work on the D6 port of Xapian, including making it so that the core patch is no longer needed.

Attached patch moves all Xapian config into the core search page, but in its own fieldset, allows hiding of std node search, and xapian taking over, and uses std search hooks for the module itself.

CommentFileSizeAuthor
#4 0001-minor-re-format-results.patch1.72 KBmarvil07
#4 0002-xapian-on-default-search-block.patch888 bytesmarvil07
#4 hooks-insted-of-patching-core.patch20.26 KBmarvil07
#3 xapian.module.patch20.48 KBjeremy
#2 xapian.module.patch20 KBjeremy
xapian.diff17.7 KBsingularo

Comments

jeremy’s picture

jeremy commented
Status: Needs review » Needs work

I think the idea is excellent! Unfortunately, however, I just ported a bunch of fixes from the 5.x tree and your patch no longer applies. 3 hunks fail.

jeremy’s picture

jeremy commented
Status: Needs work » Needs review
StatusFileSize
new xapian.module.patch20 KB

I manually fixed the failed hunks and created a new patch, attached.

jeremy’s picture

jeremy commented
Status: Needs review » Reviewed & tested by the community
StatusFileSize
new xapian.module.patch20.48 KB

You'll also need to flush the menu cache for this to work for people already using the module -- I've attached a new patch.

The "Xapian only, hide drupal search" option does not seem to work, and should be better documented. If I search for something, I see three search tabs "Content", "Users" and "Xapian". Both "Content" and "Users" are provided by core search, why are they there if I have checked "hide drupal search"? And if they go away, does that mean I can't search users anymore?

Also, in the search results I see "node -" instead of "node type -" under each piece of content, which is less user friendly. (For example, it used to say "story - " and "page - ", now it simply says "node -".)

In any case, I think this is a huge improvement and should be committed ASAP -- we can continue to work out the remaining issues. Not having to apply a patch makes the module significantly more accessible.

marvil07’s picture

marvil07 commented
StatusFileSize
new hooks-insted-of-patching-core.patch20.26 KB
new 0002-xapian-on-default-search-block.patch888 bytes
new 0001-minor-re-format-results.patch1.72 KB

Hey, this patch is great! No more patch-core is going to save kitties :-)

Definitely a RTBC

I tried the patch on #3, and see xapian search is working fine.

I also make two little modifications:

- re-format results, allowing node type to be printed and making the results array similar to the one in hook_search() example implementation

- add condition to let xapian search on default search block when xapian_takeover is active

I make two independent little patches to easy review and rerolled main patch(hooks-insted-of-patching-core.patch) including them inside.

Thanks for the efforts inside this module :-D

marvil07’s picture

marvil07 commented

BTW:

The "Xapian only, hide drupal search" option does not seem to work, and should be better documented. If I search for something, I see three search tabs "Content", "Users" and "Xapian". Both "Content" and "Users" are provided by core search, why are they there if I have checked "hide drupal search"? And if they go away, does that mean I can't search users anymore?

I also notice the same behaviour, but after a cache clear it looks like it's expected(except for the tab that it's not selected).

marvil07’s picture

marvil07 commented

Hi,

I like xapian, and making it work with drupal is great :-) Thanks for the awesome work here

is there a way I would be able to help you with this?

maybe you need a co-maintainer hand? I can try :-)

marvil07’s picture

marvil07 commented
Status: Reviewed & tested by the community » Fixed

Committed to DRUPAL-6--1 branch :-)
http://drupal.org/cvs?commit=293838

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.