Centralize a little the code

Should be easier to add the count of element. re #79
This commit is contained in:
Sébastien Lucas 2014-06-02 21:31:55 +02:00
parent 86999dd3ec
commit 270c281741
3 changed files with 30 additions and 50 deletions

View file

@ -20,10 +20,10 @@ class Author extends Base {
public $name;
public $sort;
public function __construct($pid, $pname, $psort) {
$this->id = $pid;
$this->name = str_replace("|", ",", $pname);
$this->sort = $psort;
public function __construct($post) {
$this->id = $post->id;
$this->name = str_replace("|", ",", $post->name);
$this->sort = $post->sort;
}
public function getUri () {
@ -71,23 +71,14 @@ order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, co
}
public static function getEntryArray ($query, $params) {
list (, $result) = parent::executeQuery ($query, self::AUTHOR_COLUMNS, "", $params, -1);
$entryArray = array();
while ($post = $result->fetchObject ())
{
$author = new Author ($post->id, $post->name, $post->sort);
array_push ($entryArray, new Entry ($post->sort, $author->getEntryId (),
str_format (localize("bookword", $post->count), $post->count), "text",
array ( new LinkNavigation ($author->getUri ())), "", $post->count));
}
return $entryArray;
return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
}
public static function getAuthorById ($authorId) {
$result = parent::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
$result->execute (array ($authorId));
$post = $result->fetchObject ();
return new Author ($post->id, $post->name, $post->sort);
return new Author ($post);
}
public static function getAuthorByBookId ($bookId) {
@ -97,7 +88,7 @@ and book = ?');
$result->execute (array ($bookId));
$authorArray = array ();
while ($post = $result->fetchObject ()) {
array_push ($authorArray, new Author ($post->id, $post->name, $post->sort));
array_push ($authorArray, new Author ($post));
}
return $authorArray;
}

View file

@ -1266,6 +1266,19 @@ abstract class Base
return $entry;
}
public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
$entryArray = array();
while ($post = $result->fetchObject ())
{
$instance = new $category ($post);
array_push ($entryArray, new Entry ($post->sort, $instance->getEntryId (),
str_format (localize("bookword", $post->count), $post->count), "text",
array ( new LinkNavigation ($instance->getUri ())), "", $post->count));
}
return $entryArray;
}
public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
$totalResult = -1;

View file

@ -10,13 +10,16 @@ require_once('base.php');
class Serie extends Base {
const ALL_SERIES_ID = "cops:series";
const SERIES_COLUMNS = "series.id as id, series.name as name, series.sort as sort, count(*) as count";
const SQL_ALL_SERIES = "select {0} from series, books_series_link where series.id = series group by series.id, series.name, series.sort order by series.sort";
const SQL_SERIES_FOR_SEARCH = "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";
public $id;
public $name;
public function __construct($pid, $pname) {
$this->id = $pid;
$this->name = $pname;
public function __construct($post) {
$this->id = $post->id;
$this->name = $post->name;
}
public function getUri () {
@ -38,7 +41,7 @@ from books_series_link, series
where series.id = series and book = ?');
$result->execute (array ($bookId));
if ($post = $result->fetchObject ()) {
return new Serie ($post->id, $post->name);
return new Serie ($post);
}
return NULL;
}
@ -47,43 +50,16 @@ where series.id = series and book = ?');
$result = parent::getDb ()->prepare('select id, name from series where id = ?');
$result->execute (array ($serieId));
if ($post = $result->fetchObject ()) {
return new Serie ($post->id, $post->name);
return new Serie ($post);
}
return NULL;
}
public static function getAllSeries() {
$result = parent::getDb ()->query('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
group by series.id, series.name, series.sort
order by series.sort');
$entryArray = array();
while ($post = $result->fetchObject ())
{
$serie = new Serie ($post->id, $post->sort);
array_push ($entryArray, new Entry ($serie->name, $serie->getEntryId (),
str_format (localize("bookword", $post->count), $post->count), "text",
array ( new LinkNavigation ($serie->getUri ()))));
}
return $entryArray;
return Base::getEntryArrayWithBookNumber (self::SQL_ALL_SERIES, self::SERIES_COLUMNS, array (), "Serie");
}
public static function getAllSeriesByQuery($query) {
$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';
list (, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), -1);
$entryArray = array();
while ($post = $result->fetchObject ())
{
$serie = new Serie ($post->id, $post->sort);
array_push ($entryArray, new Entry ($serie->name, $serie->getEntryId (),
str_format (localize("bookword", $post->count), $post->count), "text",
array ( new LinkNavigation ($serie->getUri ()))));
}
return $entryArray;
return Base::getEntryArrayWithBookNumber (self::SQL_SERIES_FOR_SEARCH, self::SERIES_COLUMNS, array ('%' . $query . '%'), "Serie");
}
}