Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The multidatabase search is now the same as the normal autocomplete search. re #34

Browse source
This commit is contained in:
Sébastien Lucas 2013-12-16 21:27:04 +01:00
parent 73277af6f4
commit 6cc0d5b1bc
1 changed files with 67 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
book.php
View file

@ -675,76 +675,79 @@ function getJson ($complete = false) {
if ($search) { if ($search) {
$out = array (); $out = array ();
$pagequery = Base::PAGE_OPENSEARCH_QUERY; $pagequery = Base::PAGE_OPENSEARCH_QUERY;
$dbArray = array ("");
$d = $database;
// Special case when no databases were chosen, we search on all databases // Special case when no databases were chosen, we search on all databases
if (Base::noDatabaseSelected ()) { if (Base::noDatabaseSelected ()) {
$i = 0; $dbArray = Base::getDbNameList ();
foreach (Base::getDbNameList () as $key) { $d = 0;
Base::clearDb (); }
foreach ($dbArray as $key) {
if (Base::noDatabaseSelected ()) {
array_push ($out, array ("title" => $key, array_push ($out, array ("title" => $key,
"class" => "tt-header", "class" => "tt-header",
"navlink" => "index.php?db={$i}")); "navlink" => "index.php?db={$d}"));
list ($array, $total) = Book::getBooksByStartingLetter ('%' . $query, 1, $i, 5); Base::getDb ($d);
array_push ($out, array ("title" => str_format (localize("bookword", $total), $total),
"class" => "",
"navlink" => "index.php?page={$pagequery}&query={$query}&db={$i}&scope=book"));
$i++;
} }
return $out; foreach (array (PageQueryResult::SCOPE_BOOK,
} PageQueryResult::SCOPE_AUTHOR,
PageQueryResult::SCOPE_SERIES,
foreach (array (PageQueryResult::SCOPE_BOOK, PageQueryResult::SCOPE_TAG,
PageQueryResult::SCOPE_AUTHOR, PageQueryResult::SCOPE_PUBLISHER) as $key) {
PageQueryResult::SCOPE_SERIES, if (in_array($key, $config ['cops_ignored_search_scope'])) {
PageQueryResult::SCOPE_TAG, continue;
PageQueryResult::SCOPE_PUBLISHER) as $key) {
if (in_array($key, $config ['cops_ignored_search_scope'])) {
continue;
}
switch ($key) {
case "book" :
$array = Book::getBooksByStartingLetter ('%' . $query, 1, NULL, 5);
break;
case "author" :
$array = Author::getAuthorsByStartingLetter ('%' . $query);
break;
case "series" :
$array = Serie::getAllSeriesByQuery ($query);
break;
case "tag" :
$array = Tag::getAllTagsByQuery ($query, 1, NULL, 5);
break;
case "publisher" :
$array = Publisher::getAllPublishersByQuery ($query);
break;
}
$i = 0;
if (count ($array) == 2 && is_array ($array [0])) {
$total = $array [1];
$array = $array [0];
} else {
$total = count($array);
}
if ($total > 0) {
// Comment to help the perl i18n script
// str_format (localize("bookword", count($array))
// str_format (localize("authorword", count($array))
// str_format (localize("seriesword", count($array))
// str_format (localize("tagword", count($array))
// str_format (localize("publisherword", count($array))
array_push ($out, array ("title" => str_format (localize("{$key}word", $total), $total),
"class" => "tt-header",
"navlink" => "index.php?page={$pagequery}&query={$query}&db={$database}&scope={$key}"));
}
foreach ($array as $entry) {
if ($entry instanceof EntryBook) {
array_push ($out, array ("class" => "", "title" => $entry->title, "navlink" => $entry->book->getDetailUrl ()));
} else {
array_push ($out, array ("class" => "", "title" => $entry->title, "navlink" => $entry->getNavLink ()));
} }
$i++; switch ($key) {
if ($i > 4) { break; }; case "book" :
$array = Book::getBooksByStartingLetter ('%' . $query, 1, NULL, 5);
break;
case "author" :
$array = Author::getAuthorsByStartingLetter ('%' . $query);
break;
case "series" :
$array = Serie::getAllSeriesByQuery ($query);
break;
case "tag" :
$array = Tag::getAllTagsByQuery ($query, 1, NULL, 5);
break;
case "publisher" :
$array = Publisher::getAllPublishersByQuery ($query);
break;
}
$i = 0;
if (count ($array) == 2 && is_array ($array [0])) {
$total = $array [1];
$array = $array [0];
} else {
$total = count($array);
}
if ($total > 0) {
// Comment to help the perl i18n script
// str_format (localize("bookword", count($array))
// str_format (localize("authorword", count($array))
// str_format (localize("seriesword", count($array))
// str_format (localize("tagword", count($array))
// str_format (localize("publisherword", count($array))
array_push ($out, array ("title" => str_format (localize("{$key}word", $total), $total),
"class" => Base::noDatabaseSelected () ? "" : "tt-header",
"navlink" => "index.php?page={$pagequery}&query={$query}&db={$d}&scope={$key}"));
}
if (!Base::noDatabaseSelected ()) {
foreach ($array as $entry) {
if ($entry instanceof EntryBook) {
array_push ($out, array ("class" => "", "title" => $entry->title, "navlink" => $entry->book->getDetailUrl ()));
} else {
array_push ($out, array ("class" => "", "title" => $entry->title, "navlink" => $entry->getNavLink ()));
}
$i++;
if ($i > 4) { break; };
}
}
}
$d++;
if (Base::noDatabaseSelected ()) {
Base::clearDb ();
} }
} }
return $out; return $out;