*** tagadelic_views.module.old Sun May 25 06:27:59 2008 --- tagadelic_views.module Sun May 25 06:28:41 2008 *************** *** 47,57 **** $join = str_replace('LEFT JOIN {term_node} term_node ON node.nid = term_node.nid', '', $join); $join = str_replace('LEFT JOIN {term_data} term_data ON term_node.tid = term_data.tid', '', $join); $result = db_query_range('SELECT term_data.tid, COUNT(*) AS count, term_data.name, term_data.vid FROM {node} node INNER JOIN {term_node} term_node ON term_node.nid = node.nid INNER JOIN {term_data} term_data ON term_data.tid = term_node.tid '. $join .' WHERE (1)'. $where .' GROUP BY term_data.tid, term_data.name, term_data.vid ORDER BY count DESC', 0, $size); } else { ! $placeholders = substr(str_repeat('%d', count($vids)), 0, -1); $result = db_query_range('SELECT term_data.tid, COUNT(*) AS count, term_data.name, term_data.vid FROM {node} node INNER JOIN {term_node} term_node ON term_node.nid = node.nid INNER JOIN {term_data} term_data ON term_data.tid = term_node.tid '. $join .' WHERE term_data.vid IN ('. $placeholders .')'. $where .' GROUP BY term_data.tid, term_data.name, term_data.vid ORDER BY count DESC', $vids, 0, $size); } $tags = tagadelic_build_weighted_tags($result, $steps); $tags = tagadelic_sort_tags($tags); --- 47,57 ---- $join = str_replace('LEFT JOIN {term_node} term_node ON node.nid = term_node.nid', '', $join); $join = str_replace('LEFT JOIN {term_data} term_data ON term_node.tid = term_data.tid', '', $join); $result = db_query_range('SELECT term_data.tid, COUNT(*) AS count, term_data.name, term_data.vid FROM {node} node INNER JOIN {term_node} term_node ON term_node.nid = node.nid INNER JOIN {term_data} term_data ON term_data.tid = term_node.tid '. $join .' WHERE (1)'. $where .' GROUP BY term_data.tid, term_data.name, term_data.vid ORDER BY count DESC', 0, $size); } else { ! $placeholders = substr(str_repeat('%d,', count($vids)), 0, -1); $result = db_query_range('SELECT term_data.tid, COUNT(*) AS count, term_data.name, term_data.vid FROM {node} node INNER JOIN {term_node} term_node ON term_node.nid = node.nid INNER JOIN {term_data} term_data ON term_data.tid = term_node.tid '. $join .' WHERE term_data.vid IN ('. $placeholders .')'. $where .' GROUP BY term_data.tid, term_data.name, term_data.vid ORDER BY count DESC', $vids, 0, $size); } $tags = tagadelic_build_weighted_tags($result, $steps); $tags = tagadelic_sort_tags($tags);