twitter_views.test @@ -20,8 +20,8 @@ class twitter_views_plugin_query_twitter extends views_plugin_query { * Builds the necessary info to execute the query. */ function build(&$view) { - $view->build_info['query'] = $this->query(); - $view->build_info['count_query'] = $this->query(TRUE); + $view->build_info['query'] = $this->query($view); + $view->build_info['count_query'] = $this->query($view, TRUE); $view->build_info['query_args'] = $this->get_where_args(); } @@ -33,64 +33,47 @@ class twitter_views_plugin_query_twitter extends views_plugin_query { * $view->pager['current_page']. */ function execute(&$view) { - $query = $this->query(); + $query = $view->build_info['query']; + if ($query) { + $replacements = module_invoke_all('views_query_substitutions', $view); + $query = str_replace(array_keys($replacements), $replacements, $query); - // TODO This has to live somewhere else, f.e. in function query(); - $params = array(); - if (!empty($view->pager['items_per_page'])) { - $params['rpp'] = $view->pager['items_per_page'] <= 100 ? $view->pager['items_per_page'] : 100; - } - $params['q'] = $query; - // Build the rest of the code. - $items = array(); - if ($params) { - foreach ($params as $key => $value) { - if ($key == 'q') { - array_unshift($items, 'q='. urlencode($value)); - } - else { - $items[] = urlencode($key .'='. $value); - } - } - } - $params = implode('&', $items); + $url = $this->api_url .'?'. $query; + dsm($url); - $url = $this->api_url .'?'. $params; - dvm($url); + $start = views_microtime(); - $start = views_microtime(); + $results = drupal_http_request($url, array(), 'GET'); - $results = drupal_http_request($url, array(), 'GET'); + if (_twitter_request_failure($results)) { + return FALSE; + } - if (_twitter_request_failure($results)) { - return FALSE; - } - - $results = json_decode($results->data, TRUE); + $results = json_decode($results->data, TRUE); - if ($results['results']) { - $view->result = $results['results']; + if ($results['results']) { + $view->result = $results['results']; - // $this->results are arrays. - foreach ($view->result as $key => $value) { - $view->result[$key] = (object) $value; - } + // $this->results are arrays. + foreach ($view->result as $key => $value) { + $view->result[$key] = (object) $value; + } - // Save the metadata into the object - unset($results['results']); - foreach ($results as $key => $value) { - $this->$key = $value; - } - - $this->execute_time = $this->completed_in; + // Save the metadata into the object + unset($results['results']); + foreach ($results as $key => $value) { + $this->$key = $value; + } - // FIXME - $this->total_rows = $this->results_per_page * 2; - $this->pager['current_page'] = $this->page -1; + $this->execute_time = $this->completed_in; + + // FIXME + $this->total_rows = $this->results_per_page * 2; + $this->pager['current_page'] = $this->page -1; + } } -// dsm($view->result); $view->execute_time = views_microtime() - $start; } @@ -103,12 +86,33 @@ class twitter_views_plugin_query_twitter extends views_plugin_query { * @param $get_count * Provide a countquery if this is true, otherwise provide a normal query. */ - function query($get_count = FALSE) { + function query($view, $get_count = FALSE) { $where = $this->condition_query(); - return $where; + + $params = array(); + if (!empty($view->pager['items_per_page'])) { + $params['rpp'] = $view->pager['items_per_page'] <= 100 ? $view->pager['items_per_page'] : 100; + } + $params['q'] = $where; + + // Build the rest of the code. + $items = array(); + if ($params) { + foreach ($params as $key => $value) { + if ($key == 'q') { + array_unshift($items, 'q='. urlencode($value)); + } + else { + $items[] = urlencode($key .'='. $value); + } + } + } + $params = implode('&', $items); + + return $params; } - + /** * Construct the "WHERE" or "HAVING" part of the query. * twitter_views_plugin_query_twitter.inc 80e33088e8d072d9089802d644582220a3ba0fe8 Daniel Wehner daniel.wehner@erdfisch.de http://github.com/dereine/twitter_views/commit/69a90ea4dd90f9af9e54bf3a2ca1bc040566dab1 69a90ea4dd90f9af9e54bf3a2ca1bc040566dab1 2009-10-31T17:23:30-07:00 2009-10-31T17:23:30-07:00 added test file some refactoring 21fe7b6f3d996dddf0ba9c2afb6f20e9d503bd3f Daniel Wehner daniel.wehner@erdfisch.de