Make member counts from the new category table available for subcategories, beef...

diff --git a/includes/Category.php b/includes/Category.php
index f386bee..4386491 100644 (file)
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -11,6 +11,8 @@ class Category {
        /** Name of the category, normalized to DB-key form */
        private $mName = null;
        private $mID = null;
+       /** Category page title */
+       private $mTitle = null;
        /** Counts of membership (cat_pages, cat_subcats, cat_files) */
        private $mPages = null, $mSubcats = null, $mFiles = null;
 
@@ -21,11 +23,12 @@ class Category {
         * @return bool True on success, false on failure.
         */
        protected function initialize() {
+               if ( $this->mName === null && $this->mTitle ) 
+                       $this->mName = $title->getDBKey();
+
                if( $this->mName === null && $this->mID === null ) {
                        throw new MWException( __METHOD__.' has both names and IDs null' );
-               }
-               $dbr = wfGetDB( DB_SLAVE );
-               if( $this->mID === null ) {
+               } elseif( $this->mID === null ) {
                        $where = array( 'cat_title' => $this->mName );
                } elseif( $this->mName === null ) {
                        $where = array( 'cat_id' => $this->mID );
@@ -33,6 +36,7 @@ class Category {
                        # Already initialized
                        return true;
                }
+               $dbr = wfGetDB( DB_SLAVE );
                $row = $dbr->selectRow(
                        'category',
                        array( 'cat_id', 'cat_title', 'cat_pages', 'cat_subcats',
@@ -70,10 +74,27 @@ class Category {
         */
        public static function newFromName( $name ) {
                $cat = new self();
-               $title = Title::newFromText( "Category:$name" );
+               $title = Title::makeTitleSafe( NS_CATEGORY, $name );
                if( !is_object( $title ) ) {
                        return false;
                }
+
+               $cat->mTitle = $title;
+               $cat->mName = $title->getDBKey();
+
+               return $cat;
+       }
+
+       /**
+        * Factory function.
+        *
+        * @param array $title Title for the category page
+        * @return mixed Category, or false on a totally invalid name
+        */
+       public static function newFromTitle( $title ) {
+               $cat = new self();
+
+               $cat->mTitle = $title;
                $cat->mName = $title->getDBKey();
 
                return $cat;
@@ -91,6 +112,50 @@ class Category {
                return $cat;
        }
 
+       /**
+        * Factory function, for constructing a Category object from a result set
+        *
+        * @param $row result set row, must contain the cat_xxx fields. If the fields are null, 
+        *        the resulting Category object will represent an empty category if a title object
+        *        was given. If the fields are null and no title was given, this method fails and returns false.
+        * @param $title optional title object for the category represented by the given row.
+        *        May be provided if it is already known, to avoid having to re-create a title object later.
+        * @return Category
+        */
+       public static function newFromRow( $row, $title = null ) {
+               $cat->mTitle = $title;
+
+               $cat = new self();
+
+               # NOTE: the row often results from a LEFT JOIN on categorylinks. This may result in 
+               #       all the cat_xxx fields being null, if the category page exists, but nothing
+               #       was ever added to the category. This case should be treated linke an empty
+               #       category, if possible.
+
+               if ( $row->cat_title === null ) {
+                       if ( $title === null ) {
+                               # the name is probably somewhere in the row, for example as page_title,
+                               # but we can't know that here...
+                               return false;
+                       } else {
+                               $cat->mName = $title->getDBKey(); # if we have a title object, fetch the category name from there
+                       }
+
+                       $cat->mID =   false;
+                       $cat->mSubcats = 0;
+                       $cat->mPages   = 0;
+                       $cat->mFiles   = 0;
+               } else {
+                       $cat->mName    = $row->cat_title;
+                       $cat->mID      = $row->cat_id;
+                       $cat->mSubcats = $row->cat_subcats;
+                       $cat->mPages   = $row->cat_pages;
+                       $cat->mFiles   = $row->cat_files;
+               }
+
+               return $cat;
+       }
+
        /** @return mixed DB key name, or false on failure */
        public function getName() { return $this->getX( 'mName' ); }
        /** @return mixed Category ID, or false on failure */
@@ -106,10 +171,14 @@ class Category {
         * @return mixed The Title for this category, or false on failure.
         */
        public function getTitle() {
+               if( $this->mTitle ) return $this->mTitle;
+               
                if( !$this->initialize() ) {
                        return false;
                }
-               return Title::makeTitleSafe( NS_CATEGORY, $this->mName );
+
+               $this->mTitle = Title::makeTitleSafe( NS_CATEGORY, $this->mName );
+               return $this->mTitle;
        }
 
        /** Generic accessor */

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 9a3d5b7..bf1e7d4 100644 (file)
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -135,7 +135,16 @@ class CategoryViewer {
        }
 
        /**
-        * Add a subcategory to the internal lists
+        * Add a subcategory to the internal lists, using a Category object
+        */
+       function addSubcategoryObject( $cat, $sortkey, $pageLength ) {
+               $title = $cat->getTitle();
+               $this->addSubcategory( $title, $sortkey, $pageLength );
+       }
+
+       /**
+        * Add a subcategory to the internal lists, using a title object 
+        * @deprectated kept for compatibility, please use addSubcategoryObject instead
         */
        function addSubcategory( $title, $sortkey, $pageLength ) {
                global $wgContLang;
@@ -213,17 +222,17 @@ class CategoryViewer {
                        $this->flip = false;
                }
                $res = $dbr->select(
-                       array( 'page', 'categorylinks' ),
-                       array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey' ),
+                       array( 'page', 'categorylinks', 'category' ),
+                       array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey',
+                               'cat_id', 'cat_title', 'cat_subcats', 'cat_pages', 'cat_files' ),
                        array( $pageCondition,
-                              'cl_from          =  page_id',
-                              'cl_to'           => $this->title->getDBkey()),
-                              #'page_is_redirect' => 0),
-                       #+ $pageCondition,
+                              'cl_to' => $this->title->getDBkey() ),
                        __METHOD__,
                        array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey',
-                              'USE INDEX' => 'cl_sortkey',
-                              'LIMIT'    => $this->limit + 1 ) );
+                              'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
+                              'LIMIT'    => $this->limit + 1 ),
+                       array( 'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
+                              'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ) );
 
                $count = 0;
                $this->nextPage = null;
@@ -238,7 +247,8 @@ class CategoryViewer {
                        $title = Title::makeTitle( $x->page_namespace, $x->page_title );
 
                        if( $title->getNamespace() == NS_CATEGORY ) {
-                               $this->addSubcategory( $title, $x->cl_sortkey, $x->page_len );
+                               $cat = Category::newFromRow( $x, $title );
+                               $this->addSubcategoryObject( $cat, $x->cl_sortkey, $x->page_len );
                        } elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) {
                                $this->addImage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
                        } else {