To make the gap between Search API and Apache Solr smaller we've been working on common configs.

This patch is the result of all of that work. Please review, will be committing this very shortly

Files: 
CommentFileSizeAuthor
#14 1896470-14.patch6.34 KBjantoine
PASSED: [[SimpleTest]]: [MySQL] 520 pass(es). View
#12 1896470-12.patch7.71 KBjantoine
PASSED: [[SimpleTest]]: [MySQL] 520 pass(es). View
#9 1896470-9.patch656 bytesNick_vh
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View
#8 1896470-8.patch660 bytesNick_vh
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View
#6 1896470_highlighting.patch372 bytesmkalkbrenner
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View
#3 1896470-3.patch145.33 KBNick_vh
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View
#1 1896470-2.patch138.25 KBNick_vh
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View

Comments

Nick_vh’s picture

FileSize
138.25 KB
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View
Nick_vh’s picture

Status: Active » Needs review
Nick_vh’s picture

FileSize
145.33 KB
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View

Making sure that the live indexing tests make full use of these schemas

Nick_vh’s picture

Status: Needs review » Fixed

Committed, the live indexing test is still borked for 3.6 but it's a fault of Solr, not Drupal (does not remove the spellchecker folder)

Nick_vh’s picture

Version: 7.x-1.x-dev » 6.x-3.x-dev
Status: Fixed » Patch (to be ported)
mkalkbrenner’s picture

Version: 6.x-3.x-dev » 7.x-1.x-dev
Category: feature » bug
Status: Patch (to be ported) » Needs review
FileSize
372 bytes
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View

Since #3 has been committed highlighting is not working anymore for solr 3.x, because <str name="hl">true</str> has been removed from solrconfig.xml.

I attached a patch that enables highlighting in the default parameters, which still works for solr 1.x, too.

mkalkbrenner’s picture

Title: Integrate Apache Solr Common Configurations for Solr 3.x and 4.x » Integrate Apache Solr Common Configurations for Solr 3.x and 4.x (Highlighting broken)
Nick_vh’s picture

FileSize
660 bytes
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View

Adding back default params that we lost when implementing the common schema

Nick_vh’s picture

FileSize
656 bytes
PASSED: [[SimpleTest]]: [MySQL] 513 pass(es). View

Stupid trailing space

Nick_vh’s picture

Version: 7.x-1.x-dev » 6.x-3.x-dev
Status: Needs review » Patch (to be ported)

Both patches should be committed to 6.x-3.x

pwolanin’s picture

can't directly apply the 1st patch ... am I missing an intermediate change?

2 out of 2 hunks ignored -- saving rejects to file solr-conf/solr-4.x/solrconfig.xml.rej

jantoine’s picture

Status: Patch (to be ported) » Needs review
FileSize
7.71 KB
PASSED: [[SimpleTest]]: [MySQL] 520 pass(es). View

All of the configuration changes contained in the two patches that were committed from this thread to the 7.x-1.x branch have already been committed to the 6.x-3.x branch as well. Attached is a patch that contains all other changes.

With this patch, I am still seeing a bizzare issue in the 6.x-3.x branch and not the 7.x-1.x branch where snippets for search results are showing fine when a query string is not set, but snippets are missing when a query string is set. I pinned this issue down to the query parameters being different which lead me to this issue. Now that I have applied the attached patch and my query parameters are the same, I am at a loss as to why I am seeing different behavior between 6.x-3.x and 7.x-1.x. I am going to continue investingating and hope to provide a fix, but any direction would be helpful.

pwolanin’s picture

this change looks wrong:

@@ -143,11 +184,11 @@ class DrupalSolrMatchTestCase extends DrupalSolrOnlineWebTestCase {
   function testMatching() {
     if ($this->solr_available) { // workaround for drupal.org test bot
       $this->assertTrue($this->solr->ping(), "The Server could be Pinged");
-      $response = $this->solr->search("*:*", array('qt' => 'standard'));
+      $response = $this->solr->search("*:*", array());

if we did that in 7.x, it should be reverted.

jantoine’s picture

FileSize
6.34 KB
PASSED: [[SimpleTest]]: [MySQL] 520 pass(es). View

@pwolanin,

This was done in the 7.x-1.x branch, but I beleive it was reverted. An updated patch is attached.

pwolanin’s picture

I just committed missing piece to 6.x-3.x - this might be done now.

mkalkbrenner’s picture

Issue summary: View changes
Status: Needs review » Fixed

Status: Fixed » Closed (fixed)

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