Support for 4.6/CVS

Thanks for your work with taxonomy hierarchy in Drupal. This is fantastic. I'm trying to get the distant parent module and the patches for the taxonomy and taxonomy_context modules to work with 4.6. It seems that distant parent works fine in 4.6, with the minor flaw that it doesn't appear in the admin menu in the standard 4.6 settings location.

As for the patches, you've already noted in your tutorial that some of the breadcrumb functionality (step 1 in your tutorial) has already been implemented in the 4.6 version of the taxonomy module.

Are these other patches also available in a 4.6 version? I tried to hand edit the 4.6 modules with the additional code, but the changes in 4.6 made the old patches result in the following error:

Parse error: parse error, unexpected T_ELSE in /home/gov/alpinecounty/WWW/drupal/modules/taxonomy.module on line 729

Any help you can provide in making this work in 4.6 would be greatly appreciated! Thanks in advance.

Here's the patched code that I tried for the taxonomy module:

/**
* Find all parents of a given term ID.
* Patched to allow cross-vocabulary relationships.
* Patch done by bomarmonk on 2005-04-11.
*/
function taxonomy_get_parents($tid, $key = 'tid') {
if ($tid) {
if ($distantparent) {
// Cross-vocabulary-aware SQL query
$sql_distantparent = 'SELECT t.* FROM {term_data} t, {term_hierarchy} h LEFT JOIN {term_distantparent} d ON h.tid = d.tid '.
'WHERE h.tid = %d AND (d.parent = t.tid OR h.parent = t.tid)';
$result = db_query($sql_distantparent, $tid);
} else {
//Original drupal query
$result = db_query('SELECT t.* FROM {term_hierarchy} h, {term_data} t WHERE h.parent = t.tid AND h.tid = %d ORDER BY weight, name', $tid);
$parents = array();
while ($parent = db_fetch_object($result)) {
if (function_exists('taxonomy_access')) {
if (taxonomy_access('view', $parent->tid)) {
$parents[$parent->$key] = $parent;
}
}
else {
$parents[$parent->$key] = $parent;
}
}
return $parents;
}
else {
return array();
}
}

...and

/**
* Find all ancestors of a given term ID.
* Patched to call helper functions using the optional "distantparent" argument, so that cross-vocabulary-aware queries are activated.
* Patch done by bomarmonk on 2005-04-11.
*/
function taxonomy_get_parents_all($tid, $distantparent = FALSE) {
$parents = array();
if ($tid) {
$parents[] = taxonomy_get_term($tid);
$n = 0;
while ($parent = taxonomy_get_parents($parents[$n]->tid, 'tid', $distantparent)) {
$parents = array_merge($parents, $parent);
$n++;
}
}
return $parents;
}

Here's what I tried for taxonomy context:

/**
* Return the breadcrumb of taxonomy terms ending with $tid
*/
* Patched to call taxonomy_get_parents_all() with the optional $distantparent argument set to TRUE, to implement cross-vocabulary hierarches.
* Patch done by bomarmonk on 2005-04-11.
*/
function taxonomy_context_get_breadcrumb($tid, $mode) {
$breadcrumb[] = l(t("Home"), "");
if (module_exist("vocabulary_list")) {
$vid = taxonomy_context_get_term_vocab($tid);
$vocab = taxonomy_get_vocabulary($vid);
$breadcrumb[] = l($vocab->name, "taxonomy/page/vocab/$vid");
}
if ($tid) {
// New $distantparent argument added with value TRUE
$parents = taxonomy_get_parents_all($tid, TRUE);
if ($parents) {
$parents = array_reverse($parents);
foreach ($parents as $p) {
// The line below implements the breadcrumb patch
if ($mode != "taxonomy" || $p->tid != $tid)
$breadcrumb[] = l($p->name, "taxonomy/term/$p->tid");
}
}
}
return $breadcrumb;
}