Do not hide details on attachment edit page

[WebKit-https.git] / Websites / perf.webkit.org / public / api / commits.php

diff --git a/Websites/perf.webkit.org/public/api/commits.php b/Websites/perf.webkit.org/public/api/commits.php
index 83672af5c414b8c218a2412487b9e5e40ced3473..7679cd2ee0f924d6770b907e8afe081d1be2df89 100644 (file)
--- a/Websites/perf.webkit.org/public/api/commits.php
+++ b/Websites/perf.webkit.org/public/api/commits.php
@@ -20,7 +20,10 @@ function main($paths) {
     $single_commit = NULL;
     $commits = array();
     if (!$filter) {
-        $commits = $db->fetch_table('commits', 'commit_time');
+        $keyword = array_get($_GET, 'keyword');
+        $from = array_get($_GET, 'from');
+        $to = array_get($_GET, 'to');
+        $commits = fetch_commits_between($db, $repository_id, $from, $to, $keyword);
     } else if ($filter == 'oldest') {
         $single_commit = $db->select_first_row('commits', 'commit', array('repository' => $repository_id), 'time');
     } else if ($filter == 'latest') {
@@ -28,20 +31,16 @@ function main($paths) {
     } else if ($filter == 'last-reported') {
         $single_commit = $db->select_last_row('commits', 'commit', array('repository' => $repository_id, 'reported' => true), 'time');
     } else if (ctype_alnum($filter)) {
-        $single_commit = commit_from_revision($db, $repository_id, $repository_name, $filter);
+        $single_commit = commit_from_revision($db, $repository_id, $filter);
     } else {
         $matches = array();
         if (!preg_match('/([A-Za-z0-9]+)[\:\-]([A-Za-z0-9]+)/', $filter, $matches))
             exit_with_error('UnknownFilter', array('repositoryName' => $repository_name, 'filter' => $filter));
 
-        $first = commit_from_revision($db, $repository_id, $matches[1])['commit_time'];
-        $second = commit_from_revision($db, $repository_id, $matches[2])['commit_time'];
-        $in_order = $first < $second;
-
-        $commits = fetch_commits_between($db, $repository_id, $in_order ? $first : $second, $in_order ? $second : $first);
+        $commits = fetch_commits_between($db, $repository_id, $matches[1], $matches[2]);
     }
 
-    exit_with_success(array('commits' => format_commits($single_commit ? array($single_commit) : $commits)));
+    exit_with_success(array('commits' => $single_commit ? format_commit($single_commit) : $commits));
 }
 
 function commit_from_revision($db, $repository_id, $revision) {
@@ -55,28 +54,51 @@ function commit_from_revision($db, $repository_id, $revision) {
     return $row;
 }
 
-function fetch_commits_between($db, $repository_id, $from, $to) {
-    $commits = $db->query_and_fetch_all('SELECT * FROM commits
-        WHERE commit_repository = $1 AND commit_time >= $2 AND commit_time <= $3 AND commit_reported = true ORDER BY commit_time',
-        array($repository_id, $from, $to));
-    if (!$commits)
-        exit_with_error('FailedToFetchCommits', array('repository' => $repository_id, 'from' => $from, 'to' => $to));
+function fetch_commits_between($db, $repository_id, $first, $second, $keyword = NULL) {
+    $statements = 'SELECT commit_id as "id",
+        commit_revision as "revision",
+        commit_parent as "parent",
+        commit_time as "time",
+        commit_author_name as "authorName",
+        commit_author_email as "authorEmail",
+        commit_message as "message"
+        FROM commits WHERE commit_repository = $1 AND commit_reported = true';
+    $values = array($repository_id);
+
+    if ($first && $second) {
+        $first = commit_from_revision($db, $repository_id, $first)['commit_time'];
+        $second = commit_from_revision($db, $repository_id, $second)['commit_time'];
+        $in_order = $first < $second;
+        array_push($values, $in_order ? $first : $second);
+        $statements .= ' AND commit_time >= $' . count($values);
+        array_push($values, $in_order ? $second : $first);
+        $statements .= ' AND commit_time <= $' . count($values);
+    }
+
+    if ($keyword) {
+        array_push($values, '%' . str_replace(array('\\', '_', '@'), array('\\\\', '\\_', '\\%'), $keyword) . '%');
+        $index = '$' . count($values);
+        $statements .= " AND (commit_author_name LIKE $index OR commit_author_email LIKE $index";
+        array_push($values, ltrim($keyword, 'r'));
+        $statements .= ' OR commit_revision = $' . count($values) . ')';
+    }
+
+    $commits = $db->query_and_fetch_all($statements . ' ORDER BY commit_time', $values);
+    if (!is_array($commits))
+        exit_with_error('FailedToFetchCommits', array('repository' => $repository_id, 'first' => $first, 'second' => $second));
     return $commits;
 }
 
-function format_commits($commits) {
-    $formatted_commits = array();
-    foreach ($commits as $commit_row) {
-        array_push($formatted_commits, array(
-            'id' => $commit_row['commit_id'],
-            'revision' => $commit_row['commit_revision'],
-            'parent' => $commit_row['commit_parent'],
-            'time' => $commit_row['commit_time'],
-            'author' => array('name' => $commit_row['commit_author_name'], 'email' => $commit_row['commit_author_email']),
-            'message' => $commit_row['commit_message']
-        ));
-    }
-    return $formatted_commits;
+function format_commit($commit_row) {
+    return array(array(
+        'id' => $commit_row['commit_id'],
+        'revision' => $commit_row['commit_revision'],
+        'parent' => $commit_row['commit_parent'],
+        'time' => $commit_row['commit_time'],
+        'authorName' => $commit_row['commit_author_name'],
+        'authorEmail' => $commit_row['commit_author_email'],
+        'message' => $commit_row['commit_message']
+    ));
 }
 
 main(array_key_exists('PATH_INFO', $_SERVER) ? explode('/', trim($_SERVER['PATH_INFO'], '/')) : array());