<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2183] 2013/frederickding/importer/trunk: Add abort button (see #340) and fix iterator state (see #327).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2183">2183</a></dd>
<dt>Author</dt> <dd>frederick.ding</dd>
<dt>Date</dt> <dd>2013-07-30 04:23:18 +0000 (Tue, 30 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add abort button (see <a href="http://gsoc.trac.wordpress.org/ticket/340">#340</a>) and fix iterator state (see <a href="http://gsoc.trac.wordpress.org/ticket/327">#327</a>).
- Store counter and seek instead of trying to store iterator</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013frederickdingimportertrunkclasswordpressimporterphp">2013/frederickding/importer/trunk/class-wordpress-importer.php</a></li>
<li><a href="#2013frederickdingimportertrunkwordpressimporterphp">2013/frederickding/importer/trunk/wordpress-importer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013frederickdingimportertrunkclasswordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/class-wordpress-importer.php (2182 => 2183)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-30 03:58:12 UTC (rev 2182)
+++ 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-30 04:23:18 UTC (rev 2183)
</span><span class="lines">@@ -921,11 +921,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // use an iterator object with which we can track state
</span><del>- if ( ! ($iterator = $this->get_param( 'process_posts_iterator', null )
- instanceof ArrayIterator) )
- $iterator = new ArrayIterator( $this->posts );
</del><ins>+ $iterator = new ArrayIterator( $this->posts );
+ $skip = $this->get_param( 'process_posts_iterator', 0 );
+ if ( $skip )
+ $iterator->seek( $skip );
</ins><span class="cx">
</span><span class="cx"> foreach ( $iterator as $post ) {
</span><ins>+ $skip ++;
</ins><span class="cx"> $post = apply_filters( 'wp_import_post_data_raw', $post );
</span><span class="cx"> if ( ! post_type_exists( $post['post_type'] ) ) {
</span><span class="cx"> $error_data = array(
</span><span class="lines">@@ -1231,7 +1233,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // save the state of our iterator
</span><del>- $this->set_param('process_posts_iterator', $iterator);
</del><ins>+ $this->set_param('process_posts_iterator', $skip);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1313,12 +1315,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // use an iterator object with which we can track state
</span><del>- if ( ! ($iterator = $this->get_param( 'process_urls_iterator', null ) instanceof ArrayIterator) )
- $iterator = new ArrayIterator( $this->processed_url_remap );
</del><ins>+ $iterator = new ArrayIterator( $this->processed_url_remap );
+ $skip = $this->get_param( 'process_urls_iterator', 0 );
+ if ( $skip )
+ $iterator->seek( $skip );
</ins><span class="cx">
</span><del>- // make sure we do the longest urls first, in case one is a
</del><ins>+ // make sure we do the longest urls first, in case one is a
</ins><span class="cx"> // substring of another
</span><span class="cx"> foreach ( $iterator as $from_url => $to_url ) {
</span><ins>+ $skip ++;
</ins><span class="cx"> // remap urls in post_content
</span><span class="cx"> $wpdb->query(
</span><span class="cx"> $wpdb->prepare(
</span><span class="lines">@@ -1345,7 +1350,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // save the state of our iterator
</span><del>- $this->set_param( 'process_urls_iterator', $iterator );
</del><ins>+ $this->set_param( 'process_urls_iterator', $skip );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="2013frederickdingimportertrunkwordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/wordpress-importer.php (2182 => 2183)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/wordpress-importer.php 2013-07-30 03:58:12 UTC (rev 2182)
+++ 2013/frederickding/importer/trunk/wordpress-importer.php 2013-07-30 04:23:18 UTC (rev 2183)
</span><span class="lines">@@ -382,8 +382,10 @@
</span><span class="cx">
</span><span class="cx"> // if done, run the import_end() cleanup; note that this will wipe
</span><span class="cx"> // any error and warning data, so we need to get all that first (above)
</span><del>- if ( 'finish' == $this->importer->get_step() || is_wp_error( $error ) ||
- $_GET['abort'] ) {
</del><ins>+ if (is_wp_error($error) || $_POST['abort'])
+ $this->importer->advance('finish');
+
+ if ( 'finish' == $this->importer->get_step() ) {
</ins><span class="cx"> $this->import_end();
</span><span class="cx"> } else {
</span><span class="cx"> ?>
</span><span class="lines">@@ -394,6 +396,8 @@
</span><span class="cx"> <p class="submit">
</span><span class="cx"> <input type="submit" class="button"
</span><span class="cx"> value="<?php esc_attr_e( 'Refresh', 'wordpress-importer' ); ?>" />
</span><ins>+ <input type="submit" class="button" name="abort"
+ value="<?php esc_attr_e( 'Abort', 'wordpress-importer' ); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>