Changeset 5525

Timestamp:

05/23/07 10:32:33 (1 year ago)

Author:

ryan

Message:

Add get_term_by() and taxonomy registration bits. Move more category stuff to taxonomy. see #4189

Files:

• trunk/wp-includes/category.php (modified) (8 diffs)
• trunk/wp-includes/taxonomy.php (modified) (8 diffs)

trunk/wp-includes/category.php

@@ -8 +8 @@
-
-    if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
-$wpdb->get_col("SELECT cat_ID FROM $wpdb->categories"
+get_terms('category', 'get=ids&hierarchical=0&hide_empty=0'
-        wp_cache_add('all_category_ids', $cat_ids, 'category');
-    }
@@ -16 +16 @@
-
-function &get_categories($args = '') {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -152 +23 @@
-// Handles category caching.
-function &get_category(&$category, $output = OBJECT) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -193 +38 @@
-        $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
-
-$wpdb->get_results("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE category_nicename = '$leaf_path'
+get_terms('category', "slug=$leaf_path
-
-    if ( empty($categories) )
@@ -201 +46 @@
-        $path = '/' . $leaf_path;
-        $curcategory = $category;
-category_parent != 0) && ($curcategory->category_parent != $curcategory->cat_ID
-$wpdb->get_row("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE cat_ID = '$curcategory->category_parent'"
-category_nicename
+parent != 0) && ($curcategory->parent != $curcategory->term_id
+get_term($curcategory->parent
+slug
-        }
-
-        if ( $path == $full_path )
-cat_ID
+term_id
-    }
-
-    // If full matching is not required, return the first cat that matches the leaf.
-    if ( ! $full_match )
-cat_ID
+term_id
-
-    return NULL;
@@ -218 +63 @@
-
-function get_category_by_slug( $slug  ) {
-
-
-
-
-
-
+
-}
-
@@ -230 +70 @@
-    global $wpdb;
-
-
-
-
+
+
+
+
-}
-
@@ -253 +94 @@
-        $cat2 = & get_category($cat2); 
-
-cat_ID || !$cat2->category_
+term_id || !$cat2->
-        return false; 
-
-category_parent == $cat1->cat_ID
+parent == $cat1->term_id
-        return true; 
-
-_category
+
-} 
-

trunk/wp-includes/taxonomy.php

@@ -1 +1 @@
-<?php
+
+$wp_taxonomies =
+array('category' => array('object_type' => 'post', 'hierarchical' => true),
+'post_tag' => array('object_type' => 'post', 'hierarchical' => false),
+'link_category' => array('object_type' => 'link', 'hierarchical' => false));
+
+function is_taxonomy( $taxonomy ) {
+    global $wp_taxonomies;
+
+    return isset($wp_taxonomies[$taxonomy]);    
+}
+
+function get_taxonomy( $taxonomy ) {
+    global $wp_taxonomies;
+
+    if ( ! is_taxonomy($taxonomy) )
+        return false;
+
+    return $wp_taxonomies[$taxonomy];
+}
+
+function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
+    global $wp_taxonomies;
+
+    $args['object_type'] = $object_type;
+    $wp_taxonomies[$taxonomy] = $args;
+}
-
-/**
@@ -9 +36 @@
-function wp_insert_term( $term, $taxonomy, $args = array() ) {
-    global $wpdb;
+
+    if ( ! is_taxonomy($taxonomy) )
+        return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
-
-    $update = false;
@@ -258 +288 @@
-    global $wpdb;
-
-
+
+
+
-        $taxonomies = array($taxonomies);
+    }
+
-    $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
-
-    $defaults = array('orderby' => 'name', 'order' => 'ASC',
-        'hide_empty' => true, 'exclude' => '', 'include' => '',
-
+
+
-    $args = wp_parse_args( $args, $defaults );
-    $args['number'] = (int) $args['number'];
+    if ( ! $single_taxonomy ) {
+        $args['child_of'] = 0;
+        $args['hierarchical'] = false;
+    } else {
+        $tax = get_taxonomy($taxonomy);
+        if ( !$tax['hierarchical'] ) {
+            $args['child_of'] = 0;
+            $args['hierarchical'] = false;  
+        }
+    }
-    extract($args);
+
+    $key = md5( serialize( $args ) . serialize( $taxonomies ) );
+    if ( $cache = wp_cache_get( 'get_terms', 'terms' ) ) {
+        if ( isset( $cache[ $key ] ) )
+            return apply_filters('get_terms', $cache[$key], $taxonomies, $args);
+    }
-
-    if ( 'count' == $orderby )
@@ -273 +324 @@
-    else if ( 'name' == $orderby )
-        $orderby = 't.name';
+    else
+        $orderby = 't.term_id';
-
-    $where = '';
@@ -311 +364 @@
-    $where .= $exclusions;
-
-
+
+
+
+
+
+
+
+
+
+
+
-        $where .= ' AND tt.count > 0';
-
@@ -334 +397 @@
-        return array();
-
+    if ( $child_of || $hierarchical ) {
+        $children = _get_term_hierarchy($taxonomies[0]);
+        if ( ! empty($children) )
+            $terms = & _get_term_children($child_of, $terms);
+    }
+
+    /*
+    // Update category counts to include children.
+    if ( $pad_counts )
+        _pad_category_counts($type, $categories);
+
+    // Make sure we show empty categories that have children.
+    if ( $hierarchical && $hide_empty ) {
+        foreach ( $categories as $k => $category ) {
+            if ( ! $category->{'link' == $type ? 'link_count' : 'category_count'} ) {
+                $children = _get_cat_children($category->cat_ID, $categories);
+                foreach ( $children as $child )
+                    if ( $child->{'link' == $type ? 'link_count' : 'category_count'} )
+                        continue 2;
+
+                // It really is empty
+                unset($categories[$k]);
+            }
+        }
+    }
+    reset ( $categories );
+    */
+
+    $cache[ $key ] = $terms;
+    wp_cache_add( 'get_terms', $cache, 'terms' );
+
-    $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
-    return $terms;
@@ -345 +439 @@
-
-    if ( is_object($term) ) {
-"term:$taxonomy"
+$taxonomy
-        $_term = $term;
-    } else {
-        $term = (int) $term;
-"term:$taxonomy"
+$taxonomy
-            $_term = $wpdb->get_row("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = '$taxonomy' AND t.term_id = '$term' LIMIT 1");
-"term:$taxonomy"
+$taxonomy
-        }
-    }
-
-    $_term = apply_filters('get_term', $_term, $taxonomy);
+    $_term = apply_filters("get_$taxonomy", $_term, $taxonomy);
-
-    if ( $output == OBJECT ) {
@@ -368 +463 @@
-}
-
+function get_term_by($field, $value, $taxonomy, $output = OBJECT) {
+    global $wpdb;
+
+    if ( ! is_taxonomy($taxonomy) )
+        return false;
+
+    if ( 'slug' == $field ) {
+        $field = 't.slug';
+        $value = sanitize_title($field);
+        if ( empty($value) )
+            return false;
+    } else if ( 'name' == $field ) {
+        // Assume already escaped
+        $field = 't.name';
+    } else {
+        $field = 't.term_id';
+        $value = (int) $value;
+    }
+
+    $term = $wpdb->get_row("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = '$taxonomy' AND $field = '$value' LIMIT 1");
+    if ( !$term )
+        return false;
+
+    wp_cache_add($term->term_id, $term, $taxonomy);
+
+    if ( $output == OBJECT ) {
+        return $term;
+    } elseif ( $output == ARRAY_A ) {
+        return get_object_vars($term);
+    } elseif ( $output == ARRAY_N ) {
+        return array_values(get_object_vars($term));
+    } else {
+        return $term;
+    }
+}
+
+function _get_term_hierarchy($taxonomy) {
+    // TODO Make sure taxonomy is hierarchical
+    $children = get_option("{$taxonomy}_children");
+    if ( is_array($children) )
+        return $children;
+
+    $children = array();
+    $terms = get_terms('category', 'hide_empty=0&hierarchical=0');
+    foreach ( $terms as $term ) {
+        if ( $term->parent > 0 )
+            $children[$cterm->parent][] = $term->term_id;
+    }
+    update_option("{$taxonomy}_children", $children);
+
+    return $children;
+}
+
+function &_get_term_children($term_id, $terms) {
+    if ( empty($terms) )
+        return array();
+
+    $term_list = array();
+    $has_children = _get_term_hierarchy();
+
+    if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
+        return array();
+
+    foreach ( $terms as $term ) {
+        if ( $term->term_id == $term_id )
+            continue;
+
+        if ( $term->parent == $term_id ) {
+            $term_list[] = $term;
+
+            if ( !isset($has_children[$term->term_id]) )
+                continue;
+
+            if ( $children = _get_cat_children($term->term_id, $terms) )
+                $term_list = array_merge($term_list, $children);
+        }
+    }
+
+    return $term_list;
+}
+
-?>