Changeset 5953

Timestamp:

08/28/2007 12:08:58 AM (18 years ago)

Author:

ryan

Message:

Update dotclear and textpattern importers to use taxonomy

Location:

trunk/wp-admin/import

Files:

• dotclear.php (modified) (4 diffs)
• textpattern.php (modified) (2 diffs)

trunk/wp-admin/import/dotclear.php

@@ -8 +8 @@
     Add These Functions to make our lives easier
 **/
-if(!function_exists('get_catbynicename'))
-{
-    function get_catbynicename($category_nicename)
-    {
-    global $wpdb;
-
-    $cat_id -= 0;   // force numeric
-    $name = $wpdb->get_var('SELECT cat_ID FROM '.$wpdb->categories.' WHERE category_nicename="'.$category_nicename.'"');
-
-    return $name;
-    }
-}
 
 if(!function_exists('get_comment_count'))
@@ -27 +15 @@
         global $wpdb;
         return $wpdb->get_var('SELECT count(*) FROM '.$wpdb->comments.' WHERE comment_post_ID = '.$post_ID);
-    }
-}
-
-if(!function_exists('link_cat_exists'))
-{
-    function link_cat_exists($catname)
-    {
-        global $wpdb;
-        return $wpdb->get_var('SELECT cat_id FROM '.$wpdb->linkcategories.' WHERE cat_name = "'.$wpdb->escape($catname).'"');
     }
 }
@@ -409 +388 @@
                 // Make Post-to-Category associations
                 $cats = array();
-                if($cat1 = get_catbynicename($post_cat_name)) { $cats[1] = $cat1; }
+                $category1 = get_category_by_slug($post_cat_name);
+                $category1 = $category1->term_id;
+
+                if($cat1 = $category1) { $cats[1] = $cat1; }
 
                 if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
@@ -510 +492 @@
 
                 if ($title != "") {
-                    if ($cinfo = link_cat_exists (csc ($title))) {
-                        $category = $cinfo;
+                    if ($cinfo = is_term(csc ($title), 'link_category')) {
+                        $category = $cinfo['term_id'];
                     } else {
-                        $wpdb->query ("INSERT INTO $wpdb->linkcategories (cat_name) VALUES ('".
-                            $wpdb->escape (csc ($title))."')");
-                        $category = $wpdb->insert_id;
+                        $category = wp_insert_term($wpdb->escape (csc ($title)), 'link_category');
+                        $category = $category['term_id'];
                     }
                 } else {

trunk/wp-admin/import/textpattern.php

@@ -3 +3 @@
     Add These Functions to make our lives easier
 **/
-if(!function_exists('get_catbynicename'))
-{
-    function get_catbynicename($category_nicename)
-    {
-    global $wpdb;
-
-    $cat_id -= 0;   // force numeric
-    $name = $wpdb->get_var('SELECT cat_ID FROM '.$wpdb->categories.' WHERE category_nicename="'.$category_nicename.'"');
-
-    return $name;
-    }
-}
 
 if(!function_exists('get_comment_count'))
@@ -339 +327 @@
                 // Make Post-to-Category associations
                 $cats = array();
-                if($cat1 = get_catbynicename($Category1)) { $cats[1] = $cat1; }
-                if($cat2 = get_catbynicename($Category2)) { $cats[2] = $cat2; }
+                $category1 = get_category_by_slug($Category1);
+                $category1 = $category1->term_id;
+                $category2 = get_category_by_slug($Category2);
+                $category2 = $category1->term_id;
+                if($cat1 = $category1) { $cats[1] = $cat1; }
+                if($cat2 = $category2) { $cats[2] = $cat2; }
 
                 if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }