Author: rande
Date: 2010-01-18 19:24:33 +0100 (Mon, 18 Jan 2010)
New Revision: 26834

Modified:
   plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php
   plugins/sfSolrPlugin/branches/sf1.2/test/unit/util/sfLuceneCriteriaTest.php
Log:
[sfSolrPlugin] fix when empty string is provided

Modified: 
plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php     
2010-01-18 18:18:42 UTC (rev 26833)
+++ plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneCriteria.class.php     
2010-01-18 18:24:33 UTC (rev 26834)
@@ -156,7 +156,7 @@
        throw new sfException('Invalid terms : '.$query.' != 
'.sfLuceneApacheSolrService::escape($query));
      }
      
-     return $query;
+     return trim($query);
   }
   
   /**

Modified: 
plugins/sfSolrPlugin/branches/sf1.2/test/unit/util/sfLuceneCriteriaTest.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/test/unit/util/sfLuceneCriteriaTest.php 
2010-01-18 18:18:42 UTC (rev 26833)
+++ plugins/sfSolrPlugin/branches/sf1.2/test/unit/util/sfLuceneCriteriaTest.php 
2010-01-18 18:24:33 UTC (rev 26834)
@@ -16,7 +16,7 @@
 
 require dirname(__FILE__) . '/../../bootstrap/unit.php';
 
-$t = new limeade_test(26, limeade_output::get());
+$t = new limeade_test(27, limeade_output::get());
 
 class Foo { }
 
@@ -161,4 +161,10 @@
 
 $t->diag('testing getNewCriteria()');
 
-$t->isa_ok(inst()->getNewCriteria(), 'sfLuceneCriteria', '->getNewCriteria() 
returns a new instance of sfLuceneCriteria');
\ No newline at end of file
+$t->isa_ok(inst()->getNewCriteria(), 'sfLuceneCriteria', '->getNewCriteria() 
returns a new instance of sfLuceneCriteria');
+
+$s = inst()->add('toto')->add(' ')->add('pipop')->getQuery();
+
+$expected = 'toto AND pipop';
+$t->cmp_ok($s, '===', $expected, '->add() with empty string');
+

-- 
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.


Reply via email to