svnno****@sourc*****
svnno****@sourc*****
2010年 1月 21日 (木) 20:39:53 JST
Revision: 796 http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=796 Author: rsk Date: 2010-01-21 20:39:53 +0900 (Thu, 21 Jan 2010) Log Message: ----------- expack: - rev.100121.2030. - ResArticleã¯ã©ã¹ããªã¼ããã¼ãã®å¯¾è±¡å¤ã«ãªã£ã¦ããã®ãä¿®æ£ã Modified Paths: -------------- p2ex/trunk/conf/conf.inc.php p2ex/trunk/lib/MatomeCacheList.php p2ex/trunk/lib/startup.funcs.php -------------- next part -------------- Modified: p2ex/trunk/conf/conf.inc.php =================================================================== --- p2ex/trunk/conf/conf.inc.php 2010-01-19 21:54:56 UTC (rev 795) +++ p2ex/trunk/conf/conf.inc.php 2010-01-21 11:39:53 UTC (rev 796) @@ -7,7 +7,7 @@ // o[Wîñ $_conf = array( 'p2version' => '1.7.29+1.8.x', // rep2Ìo[W - 'p2expack' => '100120.0700', // g£pbNÌo[W + 'p2expack' => '100121.2030', // g£pbNÌo[W 'p2name' => 'expack', // rep2̼O ); Modified: p2ex/trunk/lib/MatomeCacheList.php =================================================================== --- p2ex/trunk/lib/MatomeCacheList.php 2010-01-19 21:54:56 UTC (rev 795) +++ p2ex/trunk/lib/MatomeCacheList.php 2010-01-21 11:39:53 UTC (rev 796) @@ -40,7 +40,6 @@ * L[Úª«ðæ¾·é * * @param string $type - * @param bool $forSearch * @return array */ static public function getKeyPrefix($type = null) @@ -83,7 +82,6 @@ /** * SÜÆßÇÝLbV ÌXgðæ¾·é * - * @param string $type * @return array */ static public function getAllList() @@ -102,7 +100,8 @@ /** * c·ðwèµÄLbV ðí·é * - * @param int $number + * @param int $length + * @param string $type * @return int */ static public function trim($length, $type = null) @@ -150,20 +149,16 @@ // ^f[^àí $kvs = MatomeCacheMetaDataStore::getKVS(); - /* - * ^f[^ÌûªêuxêÄ}ü³êé½ßA²HÉf[^ÌmtimeÆ - * ^f[^ÌmtimeªÙÈéÂ\«ª éB±ÌÆ«f[^Ìmtimeð - * »ÌÜÜg¤ÆgetList()ÌÊÉf[^ª¶ÝµÈ¢R[hª - * ÜÜêé±ÆÉÈéÌÅA»êðh®½ßÉf[^ƯêL[Ì - * ^f[^Ìmtimeðæ¾·éB - */ - if ($record = $kvs->getRaw($key)) { - $mtime = $record->mtime; - } $stmt = $kvs->prepare($query); $kvs->bindValueForPrefixSearch($stmt, $prefix); $stmt->bindValue(':mtime', $mtime, PDO::PARAM_INT); - $stmt->execute(); + if ($stmt->execute()) { + if ($stmt->rowCount() != $numRemoved) { + // ^f[^ÌûªêuxêÄ}ü³êé½ßA²HÉf[^Ì + // mtimeÆ^f[^ÌmtimeªÙÈé±Æª èA±±ÉB·é + $kvs->delete($key); + } + } // íµ½f[^ðÔ· return $numRemoved; Modified: p2ex/trunk/lib/startup.funcs.php =================================================================== --- p2ex/trunk/lib/startup.funcs.php 2010-01-19 21:54:56 UTC (rev 795) +++ p2ex/trunk/lib/startup.funcs.php 2010-01-21 11:39:53 UTC (rev 796) @@ -165,7 +165,7 @@ NgAbornCtl | P2[A-Z][A-Za-z]* | PresetManager | - ResHist | + Res(Article|Hist) | Session | SettingTxt | ShowBrdMenu(?:K|Pc) |