Wordpress 2.3.2-scripts

[autoinstalls/wordpress.git] / wp-admin / import / dotclear.php

diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index fd4f2d65cf3c07421184ad90be35f423b0ebf495..1bf0486015f11b849b826e89fc6a96d30abca08c 100644 (file)
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -7,18 +7,6 @@
 /**
        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'))
 {
@@ -29,15 +17,6 @@ if(!function_exists('get_comment_count'))
        }
 }
 
-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).'"');
-       }
-}
-
 if(!function_exists('link_exists'))
 {
        function link_exists($linkname)
@@ -130,19 +109,19 @@ function textconv ($s) {
 **/
 class Dotclear_Import {
 
-       function header() 
+       function header()
        {
                echo '<div class="wrap">';
                echo '<h2>'.__('Import DotClear').'</h2>';
                echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
        }
 
-       function footer() 
+       function footer()
        {
                echo '</div>';
        }
 
-       function greet() 
+       function greet()
        {
                echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog.  Mileage may vary.').'</p>';
                echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
@@ -385,6 +364,8 @@ class Dotclear_Import {
                                                        'ping_status'           => $comment_status_map[$post_open_tb],
                                                        'comment_count'         => $post_nb_comment + $post_nb_trackback)
                                                        );
+                                       if ( is_wp_error( $ret_id ) )
+                                               return $ret_id;
                                }
                                else
                                {
@@ -403,14 +384,19 @@ class Dotclear_Import {
                                                        'ping_status'           => $comment_status_map[$post_open_tb],
                                                        'comment_count'         => $post_nb_comment + $post_nb_trackback)
                                                        );
+                                       if ( is_wp_error( $ret_id ) )
+                                               return $ret_id;
                                }
                                $dcposts2wpposts[$post_id] = $ret_id;
 
                                // 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_cats('', $ret_id, $cats); }
+                               if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
                        }
                }
                // Store ID translation for later use
@@ -509,12 +495,11 @@ class Dotclear_Import {
                                extract($link);
 
                                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 {
                                        $linkname = $wpdb->escape(csc ($label));
@@ -581,7 +566,9 @@ class Dotclear_Import {
        {
                // Post Import
                $posts = $this->get_dc_posts();
-               $this->posts2wp($posts);
+               $result = $this->posts2wp($posts);
+               if ( is_wp_error( $result ) )
+                       return $result;
 
                echo '<form action="admin.php?import=dotclear&amp;step=4" method="post">';
                wp_nonce_field('import-dotclear');
@@ -729,7 +716,9 @@ class Dotclear_Import {
                                $this->import_users();
                                break;
                        case 3 :
-                               $this->import_posts();
+                               $result = $this->import_posts();
+                               if ( is_wp_error( $result ) )
+                                       echo $result->get_error_message();
                                break;
                        case 4 :
                                $this->import_comments();