beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Elastic: Respect limit, page, order, select and first where

Browse source
This commit is contained in:
Jakub Vrana 2013-07-19 14:09:43 -07:00
parent 9e2592f35f
commit 6e839eddbb
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
adminer/drivers/elastic.inc.php
View file

@ -10,10 +10,10 @@ if (isset($_GET["elastic"])) {
var $extension = "JSON", $server_info, $errno, $error, $_url; var $extension = "JSON", $server_info, $errno, $error, $_url;
function query($path) { function query($path) {
@ini_set('track_errors', 1); // @ - may be disabled
$file = @file_get_contents($this->_url . ($this->_db != "" ? "$this->_db/" : "") . $path, false, stream_context_create(array('http' => array( $file = @file_get_contents($this->_url . ($this->_db != "" ? "$this->_db/" : "") . $path, false, stream_context_create(array('http' => array(
'ignore_errors' => 1, // available since PHP 5.2.10 'ignore_errors' => 1, // available since PHP 5.2.10
)))); ))));
@ini_set('track_errors', 1); // @ - may be disabled
if (!$file) { if (!$file) {
$this->error = $php_errormsg; $this->error = $php_errormsg;
return $file; return $file;
@ -90,8 +90,19 @@ if (isset($_GET["elastic"])) {
global $adminer; global $adminer;
$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page); $query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
if (!$query) { if (!$query) {
$query = "$table/_search"; $query = "$table/_search?default_operator=AND"
. ($select != array("*") ? "&fields=" . urlencode(implode(",", $select)) : "")
. ($order ? "&sort=" . urlencode(ereg_replace(' DESC(,|$)', ':desc\1', implode(",", $order))) : "")
. ($limit ? "&size=$limit" . ($page ? "&from=" . ($page * $limit) : "") : "")
;
foreach ((array) $_GET["where"] as $val) {
if ("$val[col]$val[val]" != "") {
$query .= "&q=" . urlencode(($val["col"] != "" ? "$val[col]:" : "") . $val["val"]);
//! uses only last condition
}
}
} }
echo $adminer->selectQuery($query);
$search = $this->_conn->query($query); $search = $this->_conn->query($query);
if (!$search) { if (!$search) {
return false; return false;
@ -99,12 +110,18 @@ if (isset($_GET["elastic"])) {
$return = array(); $return = array();
foreach ($search['hits']['hits'] as $hit) { foreach ($search['hits']['hits'] as $hit) {
$row = array(); $row = array();
foreach ($hit['_source'] as $key => $val) { $fields = $hit['_source'];
$row[$key] = (is_array($val) ? implode(", ", $val) : $val); if ($select != array("*")) {
$fields = array();
foreach ($select as $key) {
$fields[$key] = $hit['fields'][$key];
}
}
foreach ($fields as $key => $val) {
$row[$key] = (is_array($val) ? json_encode($val) : $val); //! display JSON and others differently
} }
$return[] = $row; $return[] = $row;
} }
echo $adminer->selectQuery($query);
return new Min_Result($return); return new Min_Result($return);
} }