Author: rande
Date: 2010-03-17 20:21:23 +0100 (Wed, 17 Mar 2010)
New Revision: 28586
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/behavior/sfLuceneDoctrineListener.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneActionIndexer.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php
plugins/sfSolrPlugin/branches/sf1.2/modules/sfLucene/config/view.yml
plugins/sfSolrPlugin/branches/sf1.2/test/unit/highlighter/sfLuceneHighlighterXMLTest.php
Log:
[sfSolrPlugin] update view.yml
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/behavior/sfLuceneDoctrineListener.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/lib/behavior/sfLuceneDoctrineListener.class.php
2010-03-17 19:11:43 UTC (rev 28585)
+++
plugins/sfSolrPlugin/branches/sf1.2/lib/behavior/sfLuceneDoctrineListener.class.php
2010-03-17 19:21:23 UTC (rev 28586)
@@ -73,7 +73,7 @@
public function deleteIndex($node)
{
- if(sfConfig::get('app_sfLucene_disable_listener', false))
+ if(sfConfig::get('app_sfSolr_disable_listener', false))
{
return;
@@ -100,11 +100,13 @@
*/
public function insertIndex($node)
{
- if(sfConfig::get('app_sfLucene_disable_listener', false))
+
+ if(sfConfig::get('app_sfSolr_disable_listener', false))
{
return;
}
+
if(sfContext::hasInstance())
{
@@ -112,7 +114,7 @@
}
foreach ($this->getSearchInstances($node) as $instance)
- {
+ {
$instance->getIndexerFactory()->getModel($node)->insert();
$instance->getSearchService()->commit();
}
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneActionIndexer.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneActionIndexer.class.php
2010-03-17 19:11:43 UTC (rev 28585)
+++
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneActionIndexer.class.php
2010-03-17 19:21:23 UTC (rev 28586)
@@ -52,7 +52,7 @@
if ($this->deleteGuid( $this->getGuid($params)))
{
- $this->getSearch()->getEventDispatcher()->notify(new sfEvent($this,
'application.log', array('Deleted action "%s" of module "%s" from index',
$action, $module)));
+ $this->getSearch()->getEventDispatcher()->notify(new sfEvent($this,
'indexer.log', array('Deleted action "%s" of module "%s" from index', $action,
$module)));
}
return $this;
@@ -101,7 +101,7 @@
$this->addDocument($doc, $guid, 'action');
- $this->getSearch()->getEventDispatcher()->notify(new sfEvent($this,
'application.log', array('Inserted action "%s" of module "%s" to index',
$this->getAction(), $this->getModule())));
+ $this->getSearch()->getEventDispatcher()->notify(new sfEvent($this,
'indexer.log', array('Inserted action "%s" of module "%s" to index',
$this->getAction(), $this->getModule())));
return $this;
}
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php
2010-03-17 19:11:43 UTC (rev 28585)
+++ plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php
2010-03-17 19:21:23 UTC (rev 28586)
@@ -473,6 +473,8 @@
$start = $start === null ? '*' : $start;
$stop = $stop === null ? '*' : $stop;
+ // switch variable
+
if($inclusive)
{
$query = ($field ? $field . ':' : '') . '['.$start.' TO '.$stop.']';
@@ -528,7 +530,7 @@
$east = $longitude + $longitudeChange;
$west = $longitude - $longitudeChange;
- $latitudeLower = min($north, $south);
+ $latitudeLower = min($north, $south);
$latitudeUpper = max($north, $south);
$longitudeLower = min($east, $west);
Modified: plugins/sfSolrPlugin/branches/sf1.2/modules/sfLucene/config/view.yml
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/modules/sfLucene/config/view.yml
2010-03-17 19:11:43 UTC (rev 28585)
+++ plugins/sfSolrPlugin/branches/sf1.2/modules/sfLucene/config/view.yml
2010-03-17 19:21:23 UTC (rev 28586)
@@ -1,9 +1,9 @@
searchControls:
- stylesheets: [/sfLucenePlugin/css/search.css]
+ stylesheets: [/sfSolrPlugin/css/search.css]
searchNoResults:
- stylesheets: [/sfLucenePlugin/css/search.css]
+ stylesheets: [/sfSolrPlugin/css/search.css]
searchResults:
- stylesheets: [/sfLucenePlugin/css/search.css]
+ stylesheets: [/sfSolrPlugin/css/search.css]
Modified:
plugins/sfSolrPlugin/branches/sf1.2/test/unit/highlighter/sfLuceneHighlighterXMLTest.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/test/unit/highlighter/sfLuceneHighlighterXMLTest.php
2010-03-17 19:11:43 UTC (rev 28585)
+++
plugins/sfSolrPlugin/branches/sf1.2/test/unit/highlighter/sfLuceneHighlighterXMLTest.php
2010-03-17 19:21:23 UTC (rev 28586)
@@ -125,6 +125,7 @@
$t->is($highlighter->export(), $expected, '->highlight() handles entities
correctly');
+
$xml = '<?xml version="1.0"?>
<root>
<child>hellÆ bäz</child>
@@ -139,11 +140,15 @@
</root>
';
+$keyword = new sfLuceneHighlighterKeywordNamed(new
sfLuceneHighlighterMarkerSprint('<h>%s</h>'), 'fööbär');
+$keyword2 = new sfLuceneHighlighterKeywordNamed(new
sfLuceneHighlighterMarkerSprint('<s>%s</s>'), 'bäz');
+
+
$highlighter = new sfLuceneHighlighterXML($xml);
$highlighter->addKeywords(array($keyword, $keyword2));
$highlighter->highlight();
-//$t->is($highlighter->export(), $expected, '->highlight() handles UTF8
characters correctly');
+$t->is($highlighter->export(), $expected, '->highlight() handles UTF8
characters correctly');
$t->todo('->highlight() handles UTF8 characters correctly (pending elegant
solution)');
try {
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
