diff options
| -rw-r--r-- | web/html/rpc.php | 1 | ||||
| -rw-r--r-- | web/lib/aurjson.class.php | 67 |
2 files changed, 67 insertions, 1 deletions
diff --git a/web/html/rpc.php b/web/html/rpc.php index 240cad15..1a9ca34b 100644 --- a/web/html/rpc.php +++ b/web/html/rpc.php @@ -18,6 +18,7 @@ if ( $_SERVER['REQUEST_METHOD'] == 'GET' ) { echo '<ul>'; echo '<li>search</li>'; echo '<li>info</li>'; + echo '<li>multiinfo</li>'; echo '<li>msearch</li>'; echo '</ul><br />'; echo 'Each method requires the following HTTP GET syntax:<br />'; diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 25219485..bb7344ab 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -14,7 +14,9 @@ include_once("aur.inc"); **/ class AurJSON { private $dbh = false; - private static $exposed_methods = array('search', 'info', 'msearch'); + private static $exposed_methods = array( + 'search', 'info', 'multiinfo', 'msearch' + ); private static $fields = array( 'Packages.ID', 'Name', 'Version', 'CategoryID', 'Description', 'URL', 'License', @@ -108,6 +110,36 @@ class AurJSON { } /** + * Parse the args to the multiinfo function. We may have a string or an + * array, so do the appropriate thing. Within the elements, both * package + * IDs and package names are valid; sort them into the relevant arrays and + * escape/quote the names. + * @param $args the arg string or array to parse. + * @return mixed An array containing 'ids' and 'names'. + **/ + private function parse_multiinfo_args($args) { + if (!is_array($args)) { + $args = array($args); + } + + $id_args = array(); + $name_args = array(); + foreach ($args as $arg) { + if (!$arg) { + continue; + } + if (is_numeric($arg)) { + $id_args[] = intval($arg); + } else { + $escaped = mysql_real_escape_string($arg, $this->dbh); + $name_args[] = "'" . $escaped . "'"; + } + } + + return array('ids' => $id_args, 'names' => $name_args); + } + + /** * Performs a fulltext mysql search of the package database. * @param $keyword_string A string of keywords to search with. * @return mixed Returns an array of package matches. @@ -156,6 +188,39 @@ class AurJSON { } /** + * Returns the info on multiple packages. + * @param $pqdata A comma-separated list of IDs or names of the packages. + * @return mixed Returns an array of results containing the package data + **/ + private function multiinfo($pqdata) { + $fields = implode(',', self::$fields); + $args = $this->parse_multiinfo_args($pqdata); + $ids = $args['ids']; + $names = $args['names']; + + if (!$ids && !$names) { + return $this->json_error('Invalid query arguments'); + } + + $query = "SELECT {$fields} " . + " FROM Packages WHERE "; + if ($ids) { + $ids_value = implode(',', $args['ids']); + $query .= "ID IN ({$ids_value})"; + } + if ($ids && $names) { + $query .= " OR "; + } + if ($names) { + // individual names were quoted in parse_multiinfo_args() + $names_value = implode(',', $args['names']); + $query .= "Name IN ({$names_value})"; + } + + return $this->process_query('multiinfo', $query); + } + + /** * Returns all the packages for a specific maintainer. * @param $maintainer The name of the maintainer. * @return mixed Returns an array of value data containing the package data |