[P2-php-svn] [796] expack:

Zurück zum Archiv-Index

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’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
+    'p2expack'  => '100121.2030',   // Šg’£ƒpƒbƒN‚̃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‚܂Ƃߓǂ݃LƒƒƒbƒVƒ…‚̃ŠƒXƒg‚ðŽæ“¾‚·‚é
      *
-     * @param string $type
      * @return array
      */
     static public function getAllList()
@@ -102,7 +100,8 @@
     /**
      * Žc‚·”‚ðŽw’肵‚ăLƒƒƒbƒVƒ…‚ðíœ‚·‚é
      *
-     * @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[ƒ^‚Ì•û‚ªˆêu’x‚ê‚Ä‘}“ü‚³‚ê‚邽‚߁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[ƒ^‚Ì•û‚ªˆêu’x‚ê‚Ä‘}“ü‚³‚ê‚邽‚߁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) |



P2-php-svn メーリングリストの案内
Zurück zum Archiv-Index