<!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>[GlotPress][777] trunk/gp-includes: First pass on fixing the translations set count cache.</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="https://glotpress.trac.wordpress.org/changeset/777">777</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-06-18 22:12:28 +0000 (Tue, 18 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass on fixing the translations set count cache. Also fixes setting strings obsolete when they already are obsolete
props dimadin. See <a href="http://glotpress.trac.wordpress.org/ticket/208">#208</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesmiscphp">trunk/gp-includes/misc.php</a></li>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
<li><a href="#trunkgpincludesthingsoriginalphp">trunk/gp-includes/things/original.php</a></li>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/misc.php (776 => 777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/misc.php 2013-06-18 21:21:15 UTC (rev 776)
+++ trunk/gp-includes/misc.php 2013-06-18 22:12:28 UTC (rev 777)
</span><span class="lines">@@ -325,4 +325,30 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return backpress_gmt_strtotime( GP::$translation->last_modified( $translation_set ) ) > $timestamp;
</span><ins>+}
+
+
+/**
+ * Delete translation set counts cache
+ *
+ * @param int $id translation set ID
+ */
+function gp_translation_set_cache_delete( $id ) {
+ wp_cache_delete( $id, 'translation_set_status_breakdown' );
+}
+
+/**
+ * Delete counts cache for all translation sets of a project
+ *
+ * @param int $project_id project ID
+ */
+function gp_project_cache_delete_translation_sets( $project_id ) {
+ $translation_sets = GP::$translation_set->by_project_id( $project_id );
+
+ if ( ! $translation_sets )
+ return;
+
+ foreach ( $translation_sets as $set ) {
+ gp_translation_set_cache_delete( $set->id );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkgpincludesroutestranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation.php (776 => 777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation.php 2013-06-18 21:21:15 UTC (rev 776)
+++ trunk/gp-includes/routes/translation.php 2013-06-18 22:12:28 UTC (rev 777)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> $this->tmpl( 'translations', get_defined_vars() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function translations_post ( $project_path, $locale_slug, $translation_set_slug ) {
</del><ins>+ function translations_post( $project_path, $locale_slug, $translation_set_slug ) {
</ins><span class="cx"> $this->logged_in_or_forbidden();
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> if ( 'current' == $data['status'] )
</span><span class="cx"> $translation->set_status( 'current' );
</span><span class="cx">
</span><del>- wp_cache_delete( $translation_set->id, 'translation_set_status_breakdown' );
</del><ins>+ gp_translation_set_cache_delete( $translation_set->id );
</ins><span class="cx"> $translations = GP::$translation->for_translation( $project, $translation_set, 'no-limit', array('translation_id' => $translation->id), array() );
</span><span class="cx">
</span><span class="cx"> if ( $translations ) {
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> $this->errors[] = 'No translations were supplied.';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wp_cache_delete( $translation_set->id, 'translation_set_status_breakdown' );
</del><ins>+ gp_translation_set_cache_delete( $translation_set->id );
</ins><span class="cx">
</span><span class="cx"> // hack, until we make clean_url() to allow [ and ]
</span><span class="cx"> $bulk['redirect_to'] = str_replace( array('[', ']'), array_map('urlencode', array('[', ']')), $bulk['redirect_to']);
</span></span></pre></div>
<a id="trunkgpincludesthingsoriginalphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/original.php (776 => 777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/original.php 2013-06-18 21:21:15 UTC (rev 776)
+++ trunk/gp-includes/things/original.php 2013-06-18 22:12:28 UTC (rev 777)
</span><span class="lines">@@ -56,7 +56,9 @@
</span><span class="cx"> function import_for_project( $project, $translations ) {
</span><span class="cx"> global $gpdb;
</span><span class="cx"> wp_cache_delete( $project->id, self::$count_cache_group );
</span><del>- $originals_added = $originals_existing = 0;
</del><ins>+
+ $originals_added = $originals_existing = $originals_obsoleted = 0;
+
</ins><span class="cx"> $all_originals_for_project = $this->many_no_map( "SELECT * FROM $this->table WHERE project_id= %d", $project->id );
</span><span class="cx"> $originals_by_key = array();
</span><span class="cx"> foreach( $all_originals_for_project as $original ) {
</span><span class="lines">@@ -88,10 +90,17 @@
</span><span class="cx">
</span><span class="cx"> // Mark previously active, but now removed strings as obsolete
</span><span class="cx"> foreach ( $originals_by_key as $key => $value) {
</span><del>- if ( !key_exists($key, $translations->entries ) ) {
</del><ins>+ if ( ! key_exists( $key, $translations->entries ) && '-obsolete' != $value->status ) {
</ins><span class="cx"> $this->update( array('status' => '-obsolete'), array( 'id' => $value->id ) );
</span><ins>+ $originals_obsoleted++;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ // Clear cache when the amount of strings are changed
+ if ( $originals_added > 0 || $originals_obsoleted > 0 ) {
+ gp_project_cache_delete_translation_sets( $project->id );
+ }
+
</ins><span class="cx"> return array( $originals_added, $originals_existing );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation-set.php (776 => 777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2013-06-18 21:21:15 UTC (rev 776)
+++ trunk/gp-includes/things/translation-set.php 2013-06-18 22:12:28 UTC (rev 777)
</span><span class="lines">@@ -81,7 +81,9 @@
</span><span class="cx"> $translations_added += 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- wp_cache_delete( $this->id, 'translation_set_status_breakdown' );
</del><ins>+
+ gp_translation_set_cache_delete( $this->id );
+
</ins><span class="cx"> return $translations_added;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>