From d9bdd2b136a3e7624ffd1f175f01d8786544d53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Mon, 12 May 2014 22:15:51 +0200
Subject: [PATCH] Series can now be searched with normalized search. re #48,
 #49

---
 serie.php                          |  10 +++++-----
 test/BaseWithSomeBooks/metadata.db | Bin 195584 -> 195584 bytes
 test/pageTest.php                  |   1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/serie.php b/serie.php
index 31e113a..49885ef 100644
--- a/serie.php
+++ b/serie.php
@@ -74,13 +74,13 @@ order by series.sort');
     }
 
     public static function getAllSeriesByQuery($query) {
-        $result = parent::getDb ()->prepare('select series.id as id, series.name as name, series.sort as sort, count(*) as count
-from series, books_series_link
-where series.id = series and series.name like ?
+        $columns  = "series.id as id, series.name as name, series.sort as sort, count(*) as count";
+        $sql = 'select {0} from series, books_series_link
+where series.id = series and upper (series.name) like ?
 group by series.id, series.name, series.sort
-order by series.sort');
+order by series.sort';
+        list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), -1);
         $entryArray = array();
-        $result->execute (array ('%' . $query . '%'));
         while ($post = $result->fetchObject ())
         {
             $serie = new Serie ($post->id, $post->sort);
diff --git a/test/BaseWithSomeBooks/metadata.db b/test/BaseWithSomeBooks/metadata.db
index ca8af4280c47d01d4b779ed1668ed6b70bfec949..cc869580ef70b99cbd6aa91d894798a450e976a1 100644
GIT binary patch
delta 834
zcmbu7T}V_>5XaBV+_hb`%+$<MyME9Iq^@6~CX%IDVTh?HnA)nFEq;-@O7x(H4=cT>
z7d%f9^^&56ddX8-VXe4D5>Y-_SsDgvh$uuX6xH2)@gaK&&cN^=&VSCF-?TVATAUso
zdmz6v@HpfTp3lkwojQ>7-5+GNzp^yflXbE?>>adGHFYT=`bbrMk_?9Vm?$@Puyx{;
z(mJ-Ee^|vdaqT5q0mF=n!5*f!Wk%~*Mu$nUID(XHdzy|hHW)oLet>lG`zRZf?6FWK
z%i#yHirEpOiwmI)P`28Gz^L{*3Vgk(m`N1QXol|6RSKtYHAKIIQWA6$OHIwO_tsg=
za=E!)K3i+8sI7@OV=B93HPtn2UeWr8E2XnHyy>>)Y-2P^Z)llpWK+GX8YwK8QepGk
zuIKxzee?e1pcD2CSo8r|^cO;&{2zXzuNl_b0r+(T=6S{#lZ=T;vBt=FW32dTKsV&w
zcDx`YPyB|w$qU=Xk{9k82!J-Wg`H&DDQ8#K>1b>;IvhUXZvJWkeb*UL7cBjYkv3D!
z21e<6O=#2No{*m550bQWh;LuQ6XNt&93gjtN=8p97b?ZJNi1?LLHu8qpaBfSw#>MV
z_|uQMtdnCU7Ex4TwUjhk%uOX1E%gnxb(ag>W!V+79G!4T{*#1en&dKT-8rk#XihYT
zYFd$d(eOBu1cG}{V+wDXK)tA%#6IB7@3l`Ve2qOo_p7S-><io}0;h0+-~lgri)H-i
zN30f8(-=iC!f!gzPXx^17lKi~Hi<sMe-4)k9t!C*{vvq9S0?bVNLs|_1doNZ>=ISJ
ZcMgO3krk~{u!=p@?bODXMX?ia(QgP@7xw@F

delta 748
zcmbu6Ur3W-6vp3k&O6(3>c-5et=tqU(ak?$h(-iiniq9p3&Y%MHEOjK{8MzLMO0n{
z=@-0L5k+93h5C_isfD7k0z=7yE({~Jq^vZe21)kKZi4Wt!?}8%-{J6_(-@9!3`bvH
z4MokiZBW#CV0RgCwWI8(6;jmp<GwvcSinTwj$dd6WhxGRj&i5pX~1Td&C<`bW+;~i
z)?=DgsUA#HO8Q$2lQ9WVn(??nGu&!P|7J)|uyN)zAE^&`PX_#_yhj7Ib=5VeD=O2R
z+EkjpX{Sraid!ng{t@(vn<Hov@kVs(7-OBTuAvPCSxS1SP-k;cF+`v>;8HGx9N<)M
zhsxvQG>(&p(Ky|uv*b}7`d!3RIcJJ*;@Tg#l~FH^Q7g@==Aa;Mp$t&lCas5o%fVup
zu|SG!uK>4wd0e(Nz<d*+xN1PRF(<zuH@6@=&$Tf>PyRAs6v|^p{En7de@(z&o0@4~
zX<w?kntEZ6!$fnSF6jS9wl2$ygK>DV+l0`Oq~$Y!%0Pt?c=z`+1WaSH82yOZ;`4J<
z#E&8D`;Uw7<=Uom-J?hxx+EXM1&WQ)BtR?Ex|1;(JB*bes-|$AsD6p(X)-rURz1UM
z(B0F(ZebqBEy~=0UId46afy=}cLhlXgJL3t3DWio-xJ&y-q(0YY<-I-<co34B6uLK
zkKrnr^aei=^oaRkv`Fg|&Jy%WK7)${eUXrxWWg*xC3q<LTts{%Ql@aNDEz89<=^lY
aMKY+u^a*#!(kIwMf`@UR_FYdHZ_sb!zw&1Q

diff --git a/test/pageTest.php b/test/pageTest.php
index cd6d0da..ef97134 100644
--- a/test/pageTest.php
+++ b/test/pageTest.php
@@ -714,6 +714,7 @@ class PageTest extends PHPUnit_Framework_TestCase
             array ("émile zola", 1, "1 author"),
             array ("Litterature", 1, "1 tag"),
             array ("Litterâture", 1, "1 tag"),
+            array ("Serie des Rougon", 1, "1 series"),
             array ("Eugene Fasquelle", 1, "1 publisher")
         );
     }