'), '1' => t('same as current'));
- $arr_types_obj = node_type_get_types();
- foreach ($arr_types_obj as $type => $obj) {
- $types[$type] = $obj->name;
- }
- $form['sametype'] = array(
- '#type' => 'select',
- '#title' => t('Content type limit'),
- '#default_value' => variable_get('simterms_sametype_' . $delta, FALSE),
- '#options' => $types,
- '#description' => t('Limit to pages of this or these content type(s)'),
- '#multiple' => TRUE
- );
- if ($delta != 'all') {
- $terms = array();
- $tree = taxonomy_get_tree($delta);
- foreach ($tree as $term) {
- $terms[$term->tid] = $term->name;
- }
- $form['ignoreterms'] = array(
- '#type' => 'select',
- '#title' => t('Terms to be ignored'),
- '#default_value' => variable_get('simterms_ignoreterms_' . $delta, array()),
- '#options' => $terms,
- '#description' => t('Ignore selected terms here from being used to search for similar entries'),
- '#multiple' => TRUE
- );
- }
- return $form;
-}
-
-/**
- * Perform the "save" op for hook_block().
- *
- * @param $delta
- * String specifying which block to proocess.
- * @param $edit
- * Array containg the form input.
- *
- * @return
- * None. Values are saved as system variables.
- */
-function similarterms_block_save($delta = '', $edit = array()) {
- variable_set('simterms_count_' . $delta, $edit['count']);
- variable_set('simterms_sametype_' . $delta, $edit['sametype']);
- variable_set('simterms_ignoreterms_' . $delta, $edit['ignoreterms']);
- variable_set('similarterms_showcurrentnode_' . $delta, $edit['showcurrentnode']);
-}
-
-/**
- * Output the block
- *
- * @param $vocid
- * integer - vocabulary id, leave out to use ALL terms for this node
- * @param $nid
- * integer - nid, leave out to use the current node
- * @return
- * an array of node objects
- */
-function similarterms_list($vocid = 'all', $nid = NULL) {
- $lists = array();
- $nodes = array();
- $args = array();
- $list_num = 0;
- $sql = "";
- $cache_lifetime = variable_get('similarterms_cache_options', 3600);
- $count = variable_get('simterms_count_' . $vocid, 5);
-
- if (arg(0) == 'node' && is_numeric(arg(1)) && !$nid) {
- $nid = arg(1);
- }
-
- if ($nid != NULL) {
- $cid = "$vocid:$nid";
- if ($cache_lifetime) {
- if ($cached = cache_get($cid, 'cache_similarterms')) {
- return $cached->data;
- }
- }
- if (variable_get('similarterms_override_options', 0)) {
- $lists = similarterms_get_overrides($nid, $vocid);
- if ($lists[$vocid]) {
- foreach ($lists[$vocid] as $nid_list) {
- if (is_numeric($nid_list)) {
- if ($list_num <= $count) {
- $list_num = $list_num + 1;
- $nodes[] = node_load($nid_list);
- }
- }
- }
- }
- }
- $node_obj = node_load($nid);
-
- if ($vocid == 'all') {
- $terms = array_keys(taxonomy_node_get_terms($node_obj));
- }
- else {
- $terms = array_keys(taxonomy_node_get_terms_by_vocabulary($node_obj, $vocid));
- }
-
- // Filter out some terms
- $terms_filter = variable_get('simterms_ignoreterms_' . $vocid, array());
-
- foreach ($terms_filter as $v) {
- $idx = array_search($v, $terms);
- if ($idx >= 0) {
- unset($terms[$idx]);
- }
- }
-
- if (!empty($terms)) {
- //past events
- $pasts = array();
-
- $query = db_select('node', 'n', $options)
- ->addField('n', 'nid')
- ->addField('n', 'title')
- ->addExpression('COUNT(nid)', 'ncount')
- ->innerJoin('term_node', 'tn', 'n.vid = tn.vid')
- ->condition('tn.tid', $terms, 'IN');
-
- $types = variable_get('simterms_sametype_' . $vocid, FALSE);
- if (($types !== FALSE) && is_array($types) && count($types) > 0 && ($types['0'] == NULL) ) {
- if ($types[1]) {
- $node_obj = node_load($nid);
- $types[1] = $node_obj->type;
- }
- $query->condition('n.type', $types, 'IN');
- }
-
- //if showcurrentnode option is false (default state), create filter for query.
- if (!variable_get('similarterms_showcurrentnode_' . $vocid, FALSE)) {
- $query->condition('n.nid', $nid, '<>');
- }
-
- $query
- ->condition('n.status', 1)
- ->condition('n.moderate', 0)
- ->condition('n.language', '')
- ->condition('n.language', $node_obj->language)
- ->groupBy('n.nid')
- ->groupBy('n.title')
- ->groupBy('n.created');
-
- if (variable_get('similarterms_ncount_options', 'default') == 'default') {
- $query->orderBy('ncount', 'DESC');
- }
- else {
- $query->orderBy('ncount', 'ASC');
- }
- $query->orderBy('n.created', 'DESC');
- $query->range(0, $count);
-
- $result = $query->execute();
- foreach ($result as $record) {
- $r = $record->fetchObject();
- $nodes[] = node_load($r->nid);
- }
-
- // Allow modules to alter the list of nodes by implementing a hook.
- // Design pattern from comment_invoke_comment().
- foreach (module_implements('similarterms') as $name) {
- $function = $name . '_similarterms';
- $function($nodes, $node_obj);
- }
-
- if ($cache_lifetime) {
- cache_set($cid, $nodes, 'cache_similarterms', REQUEST_TIME + $cache_lifetime);
- }
- }
- }
- return $nodes;
-}
-
-/**
- * Implements hook_flush_caches().
- */
-function similarterms_flush_caches() {
- return array('cache_similarterms');
-}
-
-/**
- * Implements hook_form_alter().
- */
-function similarterms_form_alter(&$form, &$form_state, $form_id) {
- if (!empty($form['#node_edit_form'])) {
- if (!variable_get('similarterms_override_options', 0)) {
- return;
- }
- // no need to alter form if block module is off
- if (! module_exists('block')) {
- return;
- }
- $blocks = similarterms_get_active_block_vocabularies();
- // no need to alter form if no similarterms blocks are active
- if (sizeof($blocks) == 0) {
- return;
- }
- $overrides = array();
- if (is_numeric($form['nid']['#value'])) {
- $overrides = similarterms_get_overrides($form['nid']['#value']);
- }
- $form['similarterms'] = array(
- '#type' => 'fieldset',
- '#title' => t('Similar Terms'),
- '#description' => t('Override the links generated by similar terms module.'),
- '#collapsible' => 1,
- '#collapsed' => sizeof($overrides) ? 0 : 1,
- );
- $node_type = $form['type']['#value'];
- $no_similarterms = 1;
- foreach (similarterms_taxonomy_get_vocabularies() as $v) {
- if (! $blocks[$v->vid]) {
- continue;
- }
- $types = variable_get('simterms_sametype_' . $v->vid, array('0' => '0'));
- if (! $types[$node_type] && ! isset($types[0])) {
- continue;
- }
- $no_similarterms = 0;
- $form['similarterms']['similarterms_vid_' . $v->vid] = array(
- '#type' => 'fieldset',
- '#title' => $v->name,
- '#collapsible' => 1,
- '#collapsed' => sizeof($overrides[$v->vid]) ? 0 : 1,
- '#tree' => 1,
- );
- $form['similarterms']['similarterms_vid_' . $v->vid]['similarterms_paths'] = array(
- '#type' => 'fieldset',
- '#title' => t('Paths'),
- '#tree' => 1,
- );
- $count = variable_get('simterms_count_' . $v->vid, 5);
- for ($i = 0; $i < $count; $i++) {
- $default_value = '';
- if ($overrides[$v->vid][$i]) {
- $default_value = drupal_lookup_path('alias', 'node/' . $overrides[$v->vid][$i]);
- if (! $default_value) {
- $default_value = 'node/' . $overrides[$v->vid][$i];
- }
- }
- $form['similarterms']['similarterms_vid_' . $v->vid]['similarterms_paths'][$i] = array(
- '#type' => 'textfield',
- '#title' => t('Path %d', array('%d' => $i + 1)),
- '#default_value' => $default_value ? $default_value : '',
- );
- }
- $form['similarterms']['similarterms_vid_' . $v->vid]['similarterms_override_delete'] = array(
- '#type' => 'checkbox',
- '#title' => t('Delete Similar Terms Overrides?'),
- '#description' => t('If this option is checked all paths will be deleted for this vocabulary.'),
- '#default_value' => 0,
- );
- }
- if ($no_similarterms) {
- unset($form['similarterms']);
- }
- }
-}
-
-/**
- * This function returns a list of overrides
- */
-function similarterms_get_overrides($nid, $vid = NULL) {
- $paths = array();
- $query = "SELECT * FROM {similarterms_override} WHERE nid = '%s'";
- $args = array($nid);
- if ($vid) {
- $query .= " AND vid = %s";
- $args[] = $vid;
- }
- $result = db_query($query, $args);
- while ($object = db_fetch_object($result)) {
- $paths[$object->vid][] = $object->path;
- }
- return $paths;
-}
-
- /**
- * Implements hook_node_delete().
- */
-function similarterms_node_delete($node, $vid = NULL) {
- if (!variable_get('similarterms_override_options', 0)) {
- return;
- }
- $query = "DELETE FROM {similarterms_override} WHERE nid = %d";
- $args = array($node->nid);
- if ($vid) {
- $query .= " AND vid = %d";
- $args[] = $vid;
- }
- db_query($query, $args);
-}
-
-/**
- * Implements hook_node_update().
- */
-function similarterms_node_update($node) {
- similarterms_node_save($node);
-}
-
-/**
- * Implements hook_node_insert().
- */
-function similarterms_node_insert($node) {
- similarterms_node_save($node);
-}
-
-/**
- * Function to populate overrides table
- */
-function similarterms_node_save($node) {
- if (!variable_get('similarterms_override_options', 0)) {
- return;
- }
- $result = array();
- $query = "INSERT INTO {similarterms_override} (nid, path, vid) VALUES(%d, %d, %d)";
- foreach (similarterms_taxonomy_get_vocabularies() as $v) {
- $vid = 'similarterms_vid_' . $v->vid;
- $alias =& $node->$vid;
- similarterms_node_delete($node, $v->vid);
- if ($alias['similarterms_override_delete']) {
- continue;
- }
- foreach ($alias['similarterms_paths'] as $id => $path) {
- $pieces = explode('/', $path);
- if (sizeof($pieces) == 2 && $pieces[0] == "node" && is_numeric($pieces[1])) {
- $nid = $pieces[1];
- }
- else {
- $path = drupal_lookup_path('source', $path);
- $pieces = explode('/', $path);
- $nid = $pieces[1];
- }
- if ($nid) {
- $args = array(
- $node->nid,
- $nid,
- $v->vid
- );
- $result[$id] = db_query($query, $args);
- }
- }
- }
-}
-
-/**
- * Implements hook_node_validate().
- */
-function similarterms_node_validate($node, $form) {
- if (!variable_get('similarterms_override_options', 0)) {
- return;
- }
- foreach (similarterms_taxonomy_get_vocabularies() as $v) {
- $vid = 'similarterms_vid_' . $v->vid;
- $alias =& $node->$vid;
- // Make sure that the paths are valid
- foreach ($alias['similarterms_paths'] as $id => $path) {
- $pieces = explode('/', $path);
- if (sizeof($pieces) == 2 && $pieces[0] == "node" && is_numeric($pieces[1])) {
- // If there's a better way to check if a node exists, replace this code
- $thisnode = node_load($pieces[1]);
- if (! $thisnode->nid) {
- form_set_error("$vid][similarterms_paths][$id", t('%path is not a valid path', array('%path' => $path)));
- }
- }
- elseif ($path == '') {
- continue;
- }
- elseif (! drupal_lookup_path('source', $path)) {
- form_set_error("$vid][similarterms_paths][$id", t('%vocab %path is not a valid path', array('%path' => $path, '%vocab' => $v->name)));
- }
- }
- }
-}
-
-/**
- * This function returns a list of all blocks for similarterms
- *
- * Note: I could not find a public function in the block module to do this
- * so I wrote this function based on _block_rehash(). If there's a better
- * way to do this, this code should be refactored
- */
-function similarterms_get_active_block_vocabularies() {
- // TODO: add in code to check for blockcache module
- global $theme_key;
- init_theme();
- $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s' AND module = '%s'", $theme_key, 'similarterms');
- while ($object = db_fetch_object($result)) {
- if ($object->status) {
- $blocks[$object->delta] = 1;
- }
- }
- return $blocks;
-}
-
-/**
- * This function gets taxonomy vocabularies and add in 0 for "all vocabs";
- */
-function similarterms_taxonomy_get_vocabularies() {
- $object = taxonomy_get_vocabularies();
- $object[0]->vid = 0;
- $object[0]->name = t('Any Vocabulary');
- return $object;
-}
-
-/**
- * Implements hook_menui().
- */
-function similarterms_menu() {
- // Admin settings for the site.
- $items['admin/settings/similarterms'] = array(
- 'title' => 'Similar By Terms',
- 'description' => 'Basic Settings for similar term most settings are in the blocks config.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('similarterms_admin_settings'),
- 'file' => 'similarterms.admin.inc',
- 'access arguments' => array('administer site configuration'),
- 'type' => MENU_NORMAL_ITEM, // optional
- );
- return $items;
-}
-
-/**
- * Theme function for similar block
- *
- */
-function similarterms_theme() {
- return array(
- 'similarterms' => array(
- 'template' => 'similarterms',
- 'arguments' => array('display_options' => NULL, 'items' => NULL),
- ),
- );
-}
-
diff --git a/similarterms.test b/similarterms.test
new file mode 100644
index 0000000..96d33e8
--- /dev/null
+++ b/similarterms.test
@@ -0,0 +1,303 @@
+ 'Similarterms',
+ 'description' => 'Test the Similarterms module',
+ 'group' => 'Similarterms',
+ );
+ }
+ protected function setUp() {
+ parent::setUp('views', 'taxonomy', 'node', 'similarterms');
+
+ // Create a vocabulary and some terms.
+ $this->vocabulary = $this->createVocabulary();
+ for ($i = 0; $i < 3; $i++) {
+ $term = $this->createTerm($this->vocabulary);
+ $this->tids[] = $term->tid;
+ }
+
+ // Create a nodetype and attach a taxonomy field to it.
+ $this->node_type = $this->drupalCreateContentType();
+ $this->field_name = 'field_test_taxonomy';
+ $this->field = array(
+ 'field_name' => $this->field_name,
+ 'type' => 'taxonomy_term_reference',
+ 'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+ 'settings' => array(
+ 'allowed_values' => array(
+ array(
+ 'vocabulary' => $this->vocabulary->machine_name,
+ 'parent' => 0,
+ ),
+ ),
+ ),
+ );
+ field_create_field($this->field);
+ $this->instance = array(
+ 'field_name' => $this->field_name,
+ 'bundle' => $this->node_type->type,
+ 'entity_type' => 'node',
+ 'widget' => array(
+ 'type' => 'options_select',
+ ),
+ 'display' => array(
+ 'default' => array(
+ 'type' => 'taxonomy_term_reference_link',
+ ),
+ ),
+ );
+ field_create_instance($this->instance);
+
+
+ // Create the used nodes.
+ // First create a node with a term which is not used by other nodes.
+ $this->createNodeWithTerm($this->tids[0]);
+ // Create a node with a term which is is used by the third node as well.
+ $this->createNodeWithTerm($this->tids[1]);
+ // The third node should have the term of the second and forth.
+ $this->createNodeWithTerm(array($this->tids[1], $this->tids[2]));
+ $this->createNodeWithTerm(array($this->tids[2]));
+ }
+
+ /**
+ * Create a node with certain terms.
+ * @param array $tids
+ * An array of all taxonomy terms.
+ * @param array $edit
+ * The edit array @see DrupalWebTestCase::drupalCreateNode.
+ */
+ public function createNodeWithTerm($tids, array $edit = array()) {
+ $tids = (array) $tids;
+ if (!isset($edit['type'])) {
+ $edit['type'] = $this->node_type->type;
+ }
+ foreach ($tids as $tid) {
+ $edit[$this->field_name][LANGUAGE_NONE][] = array('tid' => $tid);
+ }
+
+ $node = $this->drupalCreateNode($edit);
+ $this->nids[] = $node->nid;
+ foreach ($tids as $tid) {
+ $this->nodes_per_term[$tid][] = $node->nid;
+ }
+ }
+
+ function testSimilarTerms() {
+ $nid_alias = 'node_nid';
+
+ foreach ($this->nids as $nid) {
+ $node = node_load($nid);
+ $view = $this->viewSimilarTerms();
+ $view->set_display();
+ $view->pre_execute(array($nid));
+ $view->execute();
+ switch ($nid) {
+ case 1:
+ $this->assertEqual(count($view->result), 0, "Take sure that a node without a similar term doesn't generate a view result");
+ break;
+ case 2:
+ $this->assertEqual(count($view->result), 1, "Take sure that the right amount of result are returned");
+ $this->assertIdenticalResultset($view, array(array($nid_alias => 3)));
+ break;
+
+ case 3:
+ $this->assertEqual(count($view->result), 2, "Take sure that the right amount of result are returned");
+ $this->assertIdenticalResultset($view, array(array($nid_alias => 2), array($nid_alias => 4)));
+ break;
+
+ case 4:
+ $this->assertEqual(count($view->result), 1, "Take sure that the right amount of result are returned");
+ $this->assertIdenticalResultset($view, array(array($nid_alias => 4)));
+ break;
+
+ }
+
+ $view->destroy();
+ }
+ }
+
+ function testSimilarTermsIncludeArgs() {
+ foreach ($this->nids as $nid) {
+ $node = node_load($nid);
+ $view = $this->viewSimilarTerms();
+ $view->set_display();
+ $view->pre_execute(array($nid));
+ $view->argument['nid']->options['include_args'] = TRUE;
+ $view->execute();
+ switch ($nid) {
+ case 1:
+ $this->assertEqual(count($view->result), 1, "Take sure that a node without a similar term doesn't generate a view result");
+ $this->assertIdenticalResultset($view, array(array('nid' => 1)), array('node_nid' => 'nid'));
+ break;
+ case 2:
+ $this->assertEqual(count($view->result), 2, "Take sure that the right amount of result are returned");
+ $this->assertIdenticalResultset($view, array(array('nid' => 2), array('nid' => 3)), array('node_nid' => 'nid'));
+ break;
+
+ case 3:
+ $this->assertEqual(count($view->result), 3, "Take sure that the right amount of result are returned");
+ $this->assertIdenticalResultset($view, array(array('nid' => 2), array('nid' => 3), array('nid' => 4)), array('node_nid' => 'nid'));
+ break;
+
+ case 4:
+ $this->assertEqual(count($view->result), 2, "Take sure that the right amount of result are returned");
+ $this->assertIdenticalResultset($view, array(array('nid' => 3), array('nid' => 4)), array('node_nid' => 'nid'));
+ break;
+
+ }
+
+ $view->destroy();
+ }
+ }
+
+ public function viewSimilarTerms() {
+ $view = new view;
+ $view->name = 'test_similarterms';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'test_similarterms';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'test';
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['query']['options']['distinct'] = TRUE;
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '10';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'fields';
+ /* Contextual filter: Similar By Terms: Nid */
+ $handler->display->display_options['arguments']['nid']['id'] = 'nid';
+ $handler->display->display_options['arguments']['nid']['table'] = 'similarterms';
+ $handler->display->display_options['arguments']['nid']['field'] = 'nid';
+ $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'fixed';
+ $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
+ $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
+ $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
+ $handler->display->display_options['arguments']['nid']['vocabularies'] = array(
+ 1 => 0,
+ );
+ $handler->display->display_options['arguments']['nid']['include_args'] = 0;
+ /* Sort criterion: Content: Nid */
+ $handler->display->display_options['sorts']['nid']['id'] = 'nid';
+ $handler->display->display_options['sorts']['nid']['table'] = 'node';
+ $handler->display->display_options['sorts']['nid']['field'] = 'nid';
+
+ return $view;
+ }
+
+ /**
+ * Helper function: verify a result set returned by view.
+ *
+ * The comparison is done on the string representation of the columns of the
+ * column map, taking the order of the rows into account, but not the order
+ * of the columns.
+ *
+ * @param $view
+ * An executed View.
+ * @param $expected_result
+ * An expected result set.
+ * @param $column_map
+ * An associative array mapping the columns of the result set from the view
+ * (as keys) and the expected result set (as values).
+ */
+ protected function assertIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
+ return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertIdentical');
+ }
+
+ /**
+ * Helper function: verify a result set returned by view..
+ *
+ * Inverse of ViewsTestCase::assertIdenticalResultset().
+ *
+ * @param $view
+ * An executed View.
+ * @param $expected_result
+ * An expected result set.
+ * @param $column_map
+ * An associative array mapping the columns of the result set from the view
+ * (as keys) and the expected result set (as values).
+ */
+ protected function assertNotIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
+ return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertNotIdentical');
+ }
+
+ protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, $assert_method) {
+ // Convert $view->result to an array of arrays.
+ $result = array();
+ foreach ($view->result as $key => $value) {
+ $row = array();
+ foreach ($column_map as $view_column => $expected_column) {
+ // The comparison will be done on the string representation of the value.
+ $row[$expected_column] = (string) $value->$view_column;
+ }
+ $result[$key] = $row;
+ }
+
+ // Remove the columns we don't need from the expected result.
+ foreach ($expected_result as $key => $value) {
+ $row = array();
+ foreach ($column_map as $expected_column) {
+ // The comparison will be done on the string representation of the value.
+ $row[$expected_column] = (string) (is_object($value) ? $value->$expected_column : $value[$expected_column]);
+ }
+ $expected_result[$key] = $row;
+ }
+
+ // Reset the numbering of the arrays.
+ $result = array_values($result);
+ $expected_result = array_values($expected_result);
+
+ $this->verbose('Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: ". print_r($expected_result, TRUE));
+
+ // Do the actual comparison.
+ return $this->$assert_method($result, $expected_result, $message);
+ }
+}
diff --git a/similarterms.tpl.php b/similarterms.tpl.php
deleted file mode 100644
index a22766e..0000000
--- a/similarterms.tpl.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'Display titles only',
- * 'teaser' => 'Display titles and teaser',
- * - $items: the list.
- */
-if ($items) {
-$items_ls = array();
- if ($display_options == 'title_only') {
- foreach ($items as $node) {
- $items_ls[] = l($node->title, 'node/'. $node->nid);
- }
- print theme('item_list', $items_ls);
- }
- if ($display_options == 'teaser') {
- $output = '';
- foreach ($items as $node) {
- $output .= ''. l($node->title, 'node/'. $node->nid);
- $output .= ' - '. $node->teaser;
- $output .= "\n";
- }
- if ($output) {
- echo "";
- }
- }
-}
diff --git a/translations/de.po b/translations/de.po
deleted file mode 100644
index a2289f9..0000000
--- a/translations/de.po
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# LANGUAGE translation of Drupal (general)
-# Copyright YEAR NAME
-# Generated from files:
-# similarterms.module,v 1.9 2008/06/21 04:18:31 rmiddle
-# similarterms.info,v 1.2 2008/06/19 16:43:46 rmiddle
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2008-06-29 21:54-0400\n"
-"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
-"Last-Translator: NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: similarterms.module:22
-msgid "Displays a block with similar content based on taxonomy terms."
-msgstr "Zeigt einen Block von anderen ähnlichen Inhalten nach Begriffen an."
-
-#: similarterms.module:42
-msgid "Similar entries from ANY vocabulary."
-msgstr "Ähnliche Einträge aus IRGENDEINER Kategorie."
-
-#: similarterms.module:46
-msgid "Similar entries from the @vocab vocabulary."
-msgstr "Ähnliche Einträge aus der Kategorie @vocab."
-
-#: similarterms.module:54
-msgid "Item count"
-msgstr "Anzahl der Einträge"
-
-#: similarterms.module:57
-msgid "The maximum number of similar items to display"
-msgstr "Maximale Anzahl angezeigter ähnlicher Einträge"
-
-#: similarterms.module:60
-msgid "same as current"
-msgstr ""
-
-#: similarterms.module:67
-msgid "Content type limit"
-msgstr ""
-
-#: similarterms.module:70
-msgid "Limit to pages of this or these content type(s)"
-msgstr ""
-
-#: similarterms.module:81;85
-msgid "Similar"
-msgstr "Ähnlich"
-
-#: similarterms.module:33
-msgid "access similarterms content"
-msgstr ""
-
-#: similarterms.module:33
-msgid "administer similarterms content"
-msgstr ""
-
-#: similarterms.module:0
-msgid "similarterms"
-msgstr "similarterms"
-
-#: similarterms.info:0
-msgid "Similar By Terms"
-msgstr "Ähnliche Einträge zu Begriffen"
-
-#: similarterms.info:0
-msgid "Display a block of other content that is similar by keywords (taxonomy terms)."
-msgstr "Zeigt einen Block von anderen ähnlichen Inhalten nach Begriffen an."
-
diff --git a/translations/hu.po b/translations/hu.po
deleted file mode 100644
index 050f250..0000000
--- a/translations/hu.po
+++ /dev/null
@@ -1,120 +0,0 @@
-# Hungarian translation of Similar By Terms (6.x-1.18)
-# Copyright (c) 2010 by the Hungarian translation team
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Similar By Terms (6.x-1.18)\n"
-"POT-Creation-Date: 2010-07-17 22:02+0000\n"
-"PO-Revision-Date: 2010-07-17 22:01+0000\n"
-"Language-Team: Hungarian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-msgid ""
-msgstr "< nincs >"
-msgid "Never"
-msgstr "Soha"
-msgid "Similar entries from ANY vocabulary."
-msgstr "Hasonló bejegyzések BÁRMELY szótárból."
-msgid "Similar entries from the @vocab vocabulary."
-msgstr "Hasonló bejegyzések @vocab szótárból."
-msgid "Item count"
-msgstr "Elemszám"
-msgid "The maximum number of similar items to display"
-msgstr "A hasonló kifejezések megjelenítésének küszöbértéke"
-msgid "Similar"
-msgstr "Hasonló"
-msgid "Similar By Terms"
-msgstr "Hasonló kifejezések"
-msgid ""
-"Display a block of other content that is similar by keywords (taxonomy "
-"terms)."
-msgstr ""
-"Megjelenít egy blokkot hasonló tartalmakkal kulcsszavak alapján "
-"(taxonómia kifejezések)."
-msgid "Display Options"
-msgstr "Megjelenítési lehetőségek"
-msgid "Primary Key: Unique cache ID."
-msgstr "Elsődleges kulcs: egyedi gyorstár azonosító."
-msgid "A collection of data to cache."
-msgstr "A gyorstárazandó adatok gyűjteménye."
-msgid ""
-"A Unix timestamp indicating when the cache entry should expire, or 0 "
-"for never."
-msgstr ""
-"Unix időbélyeg, mely a bejegyzés lejárati idejét jelöli, vagy 0, "
-"ha nem jár le."
-msgid "A Unix timestamp indicating when the cache entry was created."
-msgstr "Unix időbélyeg, mely a bejegyzés létrehozását jelöli."
-msgid "Any custom HTTP headers to be added to cached data."
-msgstr "Egyedi HTTP fejlécek, amelyeket a gyorstárazott adathoz kell adni."
-msgid "A flag to indicate whether content is serialized (1) or not (0)."
-msgstr "1, ha a tartalom sorosított, 0 egyébként."
-msgid "Display titles only"
-msgstr "Csak a cím megjelenítése"
-msgid "Show current node as active in the list"
-msgstr "Az aktuális tartalom aktívnak jelölése a listában"
-msgid "same as current"
-msgstr "mint a jelenlegi"
-msgid "Content type limit"
-msgstr "Tartalomtípus határ"
-msgid "Limit to pages of this or these content type(s)"
-msgstr "Erre, vagy ezekre a tartalomtípusokra korlátozza a lapokat"
-msgid "Terms to be ignored"
-msgstr "Figyelmen kívül hagyott kifejezések"
-msgid ""
-"Ignore selected terms here from being used to search for similar "
-"entries"
-msgstr ""
-"Az itt kiválasztott kifejezéseket nem veszi figyelembe, amikor "
-"hasonló tartalmakat keres"
-msgid ""
-"Basic Settings for similar term most settings are in the blocks "
-"config."
-msgstr ""
-"A hasonló kifejezések alapvető beállításai, a legtöbb a blokkok "
-"beállításánál van."
-msgid "Vocabularies types to list"
-msgstr "Szótártípusok listázása"
-msgid "Default sort order"
-msgstr "Alapértelmezés szerinti rendezés"
-msgid "Prefer more unique order"
-msgstr "Több egyedi rendezés támogatása"
-msgid "Unique Order Options"
-msgstr "Egyedi sorrend lehetőségek"
-msgid "Cache Options"
-msgstr "Gyorstár lehetőségek"
-msgid "Clear Cache"
-msgstr "Gyorstár törlése"
-msgid "Clear Similarterms Block Cache"
-msgstr "Hasonló kifejezések blokk gyorstárának törlése"
-msgid "Similarterms Block Cache is now cleared"
-msgstr "A hasonló kifejezések blokk gyorstára törölve lett"
-msgid "Display multi-select and tags types only"
-msgstr "Csak a többszörös választású és a címkés típusok"
-msgid "Display all vocabularies types"
-msgstr "Minden szótártípus megjelenítése"
-msgid "Display titles and teaser"
-msgstr "Cím és bevezető megjelenítése"
-msgid "Displays a block with similar content based on taxonomy terms."
-msgstr ""
-"Megjelenít egy blokkot hasonló tartalmakkal a taxonómia "
-"kifejezések alapján."
-msgid "access similarterms content"
-msgstr "hasonló kifejezések tartalmának elérése"
-msgid "administer similarterms content"
-msgstr "hasonló kifejezések tartalmának adminisztrációja"
-msgid "similarterms module installed."
-msgstr "A hasonló kifejezések modul telepítése megtörtént."
-msgid ""
-"similarterms table creation failed. Please \"uninstall\" the module "
-"and retry."
-msgstr ""
-"A hasonló kifejezések táblája nem jött létre. El kell "
-"távolítani a modult, és ismét meg kell próbálni a telepítést."
-msgid "Cache table for the Similar by Terms Module."
-msgstr "A hasonló kifejezések modul gyorstárának táblája."
-msgid "similarterms module uninstalled."
-msgstr "A hasonló kifejezések modul el lett távolítva."
diff --git a/translations/similarterms.pot b/translations/similarterms.pot
deleted file mode 100644
index 44b5379..0000000
--- a/translations/similarterms.pot
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# LANGUAGE translation of Drupal (general)
-# Copyright YEAR NAME
-# Generated from files:
-# similarterms.module,v 1.7 2008/06/20 00:52:48 rmiddle
-# similarterms.info,v 1.2 2008/06/19 16:43:46 rmiddle
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2008-06-29 20:58-0400\n"
-"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
-"Last-Translator: NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: similarterms.module:22 similarterms/similarterms.module:21
-msgid "Displays a block with similar content based on taxonomy terms."
-msgstr ""
-
-#: similarterms.module:42 similarterms/similarterms.module:41
-msgid "Similar entries from ANY vocabulary."
-msgstr ""
-
-#: similarterms.module:46 similarterms/similarterms.module:45
-msgid "Similar entries from the @vocab vocabulary."
-msgstr ""
-
-#: similarterms.module:54 similarterms/similarterms.module:53
-msgid "Item count"
-msgstr ""
-
-#: similarterms.module:57 similarterms/similarterms.module:56
-msgid "The maximum number of similar items to display"
-msgstr ""
-
-#: similarterms.module:60 similarterms/similarterms.module:59
-msgid "same as current"
-msgstr ""
-
-#: similarterms.module:67 similarterms/similarterms.module:66
-msgid "Content type limit"
-msgstr ""
-
-#: similarterms.module:70 similarterms/similarterms.module:69
-msgid "Limit to pages of this or these content type(s)"
-msgstr ""
-
-#: similarterms.module:81;85 similarterms/similarterms.module:80;84
-msgid "Similar"
-msgstr ""
-
-#: similarterms.module:33 similarterms/similarterms.module:32
-msgid "access similarterms content"
-msgstr ""
-
-#: similarterms.module:33 similarterms/similarterms.module:32
-msgid "administer similarterms content"
-msgstr ""
-
-#: similarterms.module:0 similarterms/similarterms.module:0
-msgid "similarterms"
-msgstr ""
-
-#: similarterms.info:0 similarterms/similarterms.info:0
-msgid "Similar By Terms"
-msgstr ""
-
-#: similarterms.info:0 similarterms/similarterms.info:0
-msgid "Display a block of other content that is similar by keywords (taxonomy terms)."
-msgstr ""
-
diff --git a/views/similarterms.views.inc b/views/similarterms.views.inc
new file mode 100644
index 0000000..dcb72fb
--- /dev/null
+++ b/views/similarterms.views.inc
@@ -0,0 +1,33 @@
+ t('Similarity'),
+ 'group' => t('Similar By Terms'),
+ 'help' => t('Percentage/count of terms which node has in common with node given as argument.'),
+ 'field' => array(
+ 'handler' => 'similarterms_handler_field_similar',
+ 'click sortable' => TRUE,
+ ),
+ 'sort' => array(
+ 'handler' => 'similarterms_handler_sort_similar',
+ ),
+ );
+ $data['similarterms']['nid']['moved to'] = array('node', 'similar_nid');
+ $data['node']['similar_nid'] = array(
+ 'title' => t('Nid'),
+ 'group' => t('Similar By Terms'),
+ 'help' => t('ID of content item(s). Passes term ids to Similar By Terms.'), // The help that appears on the UI,
+ 'argument' => array(
+ 'handler' => 'similarterms_handler_argument_node_nid',
+ // 'parent' => 'views_handler_argument_numeric', // make sure parent is included
+ 'name field' => 'title', // the field to display in the summary.
+ 'numeric' => TRUE,
+ 'validate type' => 'nid',
+ ),
+ );
+}
diff --git a/views/similarterms.views_default.inc b/views/similarterms.views_default.inc
new file mode 100644
index 0000000..6dad860
--- /dev/null
+++ b/views/similarterms.views_default.inc
@@ -0,0 +1,179 @@
+name = 'similarterms';
+// $view->description = 'Similar By Terms';
+// $view->tag = 'similarterms';
+// $view->view_php = '';
+// $view->base_table = 'node';
+// $view->is_cacheable = FALSE;
+// $view->api_version = 2;
+// $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+// $handler = $view->new_display('default', 'Defaults', 'default');
+// $handler->override_option('fields', array(
+// 'title' => array(
+// 'label' => '',
+// 'alter' => array(
+// 'alter_text' => 0,
+// 'text' => '',
+// 'make_link' => 0,
+// 'path' => '',
+// 'link_class' => '',
+// 'alt' => '',
+// 'prefix' => '',
+// 'suffix' => '',
+// 'target' => '',
+// 'help' => '',
+// 'trim' => 0,
+// 'max_length' => '',
+// 'word_boundary' => 1,
+// 'ellipsis' => 1,
+// 'html' => 0,
+// 'strip_tags' => 0,
+// ),
+// 'empty' => '',
+// 'hide_empty' => 0,
+// 'empty_zero' => 0,
+// 'link_to_node' => 1,
+// 'exclude' => 0,
+// 'id' => 'title',
+// 'table' => 'node',
+// 'field' => 'title',
+// 'relationship' => 'none',
+// 'override' => array(
+// 'button' => 'Override',
+// ),
+// ),
+// ));
+// $handler->override_option('sorts', array(
+// 'similarterms' => array(
+// 'order' => 'DESC',
+// 'id' => 'similarterms',
+// 'table' => 'similarterms',
+// 'field' => 'similarterms',
+// 'relationship' => 'none',
+// 'override' => array(
+// 'button' => 'Override',
+// ),
+// ),
+// ));
+// $handler->override_option('arguments', array(
+// 'nid' => array(
+// 'default_action' => 'default',
+// 'style_plugin' => 'default_summary',
+// 'style_options' => array(),
+// 'wildcard' => 'all',
+// 'wildcard_substitution' => 'All',
+// 'title' => '',
+// 'breadcrumb' => '',
+// 'default_argument_type' => 'node',
+// 'default_argument' => '',
+// 'validate_type' => 'node',
+// 'validate_fail' => 'not found',
+// 'break_phrase' => 0,
+// 'not' => 0,
+// 'id' => 'nid',
+// 'table' => 'similarterms',
+// 'field' => 'nid',
+// 'validate_user_argument_type' => 'uid',
+// 'validate_user_roles' => array(
+// '2' => 0,
+// '4' => 0,
+// '3' => 0,
+// ),
+// 'override' => array(
+// 'button' => 'Override',
+// ),
+// 'relationship' => 'none',
+// 'default_options_div_prefix' => '',
+// 'default_argument_fixed' => '',
+// 'default_argument_user' => 0,
+// 'default_argument_php' => '',
+// 'validate_argument_node_type' => array(
+// 'blog' => 0,
+// 'product' => 0,
+// 'presenter' => 0,
+// 'playlist_video' => 0,
+// 'standalone_video' => 0,
+// 'page' => 0,
+// ),
+// 'validate_argument_node_access' => 0,
+// 'validate_argument_nid_type' => 'nid',
+// 'validate_argument_vocabulary' => array(
+// '1' => 0,
+// '3' => 0,
+// '2' => 0,
+// '4' => 0,
+// ),
+// 'validate_argument_type' => 'tid',
+// 'validate_argument_transform' => 0,
+// 'validate_user_restrict_roles' => 0,
+// 'validate_argument_node_flag_name' => '*relationship*',
+// 'validate_argument_node_flag_test' => 'flaggable',
+// 'validate_argument_node_flag_id_type' => 'id',
+// 'validate_argument_user_flag_name' => '*relationship*',
+// 'validate_argument_user_flag_test' => 'flaggable',
+// 'validate_argument_user_flag_id_type' => 'id',
+// 'validate_argument_php' => '',
+// ),
+// ));
+// $handler->override_option('filters', array(
+// 'moderate' => array(
+// 'operator' => '=',
+// 'value' => '0',
+// 'group' => '0',
+// 'exposed' => FALSE,
+// 'expose' => array(
+// 'operator' => FALSE,
+// 'label' => '',
+// ),
+// 'id' => 'moderate',
+// 'table' => 'node',
+// 'field' => 'moderate',
+// 'override' => array(
+// 'button' => 'Override',
+// ),
+// 'relationship' => 'none',
+// ),
+// 'status' => array(
+// 'operator' => '=',
+// 'value' => '1',
+// 'group' => '0',
+// 'exposed' => FALSE,
+// 'expose' => array(
+// 'operator' => FALSE,
+// 'label' => '',
+// ),
+// 'id' => 'status',
+// 'table' => 'node',
+// 'field' => 'status',
+// 'override' => array(
+// 'button' => 'Override',
+// ),
+// 'relationship' => 'none',
+// ),
+// ));
+// $handler->override_option('access', array(
+// 'type' => 'none',
+// ));
+// $handler->override_option('cache', array(
+// 'type' => 'none',
+// ));
+// $handler->override_option('title', 'Similar By Terms');
+// $handler->override_option('items_per_page', 7);
+// $handler = $view->new_display('block', 'Block', 'block_1');
+// $handler->override_option('block_description', '');
+// $handler->override_option('block_caching', '4');
+// $views[$view->name] = $view;
+//
+// return $views;
+// }
diff --git a/views/similarterms_handler_argument_node_nid.inc b/views/similarterms_handler_argument_node_nid.inc
new file mode 100644
index 0000000..2c1da8f
--- /dev/null
+++ b/views/similarterms_handler_argument_node_nid.inc
@@ -0,0 +1,131 @@
+addField('n', 'title');
+ $select->condition('n.nid', $this->value, 'IN');
+ $select->addTag('node_access');
+ $result = $select->execute();
+
+ foreach ($result as $term) {
+ $titles[] = check_plain($term->title);
+ }
+
+ return $titles;
+ }
+
+ function option_definition() {
+ $options = parent::option_definition();
+
+ $options['vocabularies'] = array('default' => array());
+ $options['include_args'] = array('default' => FALSE);
+
+ return $options;
+ }
+
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+
+ unset($form['not']);
+
+ $vocabularies = array();
+ $result = db_query('SELECT vid, name FROM {taxonomy_vocabulary} ORDER BY weight');
+ foreach ($result as $vocabulary) {
+ $vocabularies[$vocabulary->vid] = $vocabulary->name;
+ }
+
+ $form['similarterms'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Similarity by Terms'),
+ '#collapsible' => FALSE,
+ );
+ $form['similarterms']['vocabularies'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Limit similarity to terms within these vocabularies'),
+ '#description' => t('Choosing any vocabularies here will limit the terms used to calculate similarity. It is usually best NOT to limit the terms, but in some cases this is necessary. Leave all checkboxes unselected to not limit terms.'),
+ '#options' => $vocabularies,
+ '#default_value' => empty($this->options['vocabularies']) ? array() : $this->options['vocabularies'],
+ );
+
+ $form['similarterms']['include_args'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Include argument node(s) in results'),
+ '#description' => t('If selected, the node(s) passed as the argument will be included in the view results.'),
+ '#default_value' => !empty($this->options['include_args']),
+ );
+
+ }
+
+ function validate_arg($arg) {
+ // first run the inherited arg validation
+ if (!parent::validate_arg($arg)) {
+ return FALSE;
+ }
+
+ // hmmm... @todo: wildcard validation?
+ // see views_handler_argument.inc for possible code
+
+ if (!empty($this->options['break_phrase'])) {
+ views_break_phrase($this->argument, $this);
+ }
+ else {
+ $this->value = array($this->argument);
+ }
+
+ // $vocabulary_vids is array of vocabulary ids (a.k.a. vids, confusing right?)
+ $vocabulary_vids = empty($this->options['vocabularies']) ? array() : $this->options['vocabularies'];
+ foreach ($vocabulary_vids as $key => $val) {
+ if ($val == 0) {
+ unset($vocabulary_vids[$key]);
+ }
+ }
+
+ $select = db_select('taxonomy_index', 'ti');
+ $select->addField('ti', 'tid');
+
+ if (count($vocabulary_vids)) {
+ $select->join('taxonomy_term_data', 'td', 'ti.tid = td.tid');
+ $select->condition('td.vid', $vocabulary_vids, 'IN');
+ }
+ $select->condition('ti.nid', $this->value, 'IN');
+ $result = $select->execute();
+
+ $this->tids = array();
+ foreach ($result as $row) {
+ $this->tids[$row->tid] = $row->tid;
+ }
+ $this->view->tids = $this->tids;
+
+ if (count($this->tids) == 0) {
+ // there are no terms ... we need to cancel the query and bail out
+ return FALSE;
+ }
+
+ return TRUE;
+ }
+
+ function query($group_by = FALSE) {
+ $this->ensure_my_table();
+
+ $this->query->add_table('taxonomy_index', NULL, NULL, 'similarterms_taxonomy_index');
+ $this->query->add_where(0, "similarterms_taxonomy_index.tid", $this->tids, 'IN');
+
+ // exclude the current node(s)
+ if (empty($this->options['include_args'])) {
+ $this->query->add_where(0, "node.nid", $this->value, 'NOT IN');
+ }
+ }
+
+}
diff --git a/views/similarterms_handler_field_similar.inc b/views/similarterms_handler_field_similar.inc
new file mode 100644
index 0000000..bfc5d4e
--- /dev/null
+++ b/views/similarterms_handler_field_similar.inc
@@ -0,0 +1,57 @@
+ 1);
+ $options['percent_suffix'] = array('default' => 1);
+ return $options;
+ }
+
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+
+ $form['count_type'] = array(
+ '#type' => 'radios',
+ '#title' => t('Display type'),
+ '#default_value' => $this->options['count_type'],
+ '#options' => array(
+ 0 => t('Show count of common terms'),
+ 1 => t('Show as percentage'),
+ ),
+ );
+
+ $form['percent_suffix'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Append % when showing percentage'),
+ '#default_value' => !empty($this->options['percent_suffix']),
+ );
+ }
+
+ function query() {
+ // we MIGHT want to ensure that the COUNT data is getting added here.
+ $params = array(
+ 'function' => 'count',
+ );
+ $this->field_alias = $this->query->add_field('node', 'nid', NULL, $params);
+ }
+
+ function render($values) {
+ if ($this->options['count_type'] == 0) {
+ return $values->{$this->field_alias};
+ }
+ elseif ($this->view->tids) {
+ $output = round($values->{$this->field_alias}/count($this->view->tids) * 100);
+ if (!empty($this->options['percent_suffix'])) {
+ $output .= '%';
+ }
+ return $output;
+ }
+
+ }
+}
diff --git a/views/similarterms_handler_sort_similar.inc b/views/similarterms_handler_sort_similar.inc
new file mode 100644
index 0000000..a060897
--- /dev/null
+++ b/views/similarterms_handler_sort_similar.inc
@@ -0,0 +1,20 @@
+ 'DESC');
+ return $options;
+ }
+
+ function query() {
+ $this->ensure_my_table();
+ $this->query->add_orderby($this->table_alias, 'nid', $this->options['order'], NULL, array('function' => 'count'));
+ }
+
+}