more cssification of diff rendering, some " -> ' in diff engine

[lhc/web/wiklou.git] / includes / LinkCache.php

diff --git a/includes/LinkCache.php b/includes/LinkCache.php
index f4c50c0..4f7b03a 100644 (file)
--- a/includes/LinkCache.php
+++ b/includes/LinkCache.php
@@ -1,5 +1,5 @@
 <?php
-# Cache for article titles and ids linked from one source
+# Cache for article titles (prefixed DB keys) and ids linked from one source
 
 # These are used in incrementalSetup()
 define ('LINKCACHE_GOOD', 0);
@@ -9,10 +9,10 @@ define ('LINKCACHE_IMAGE', 2);
 class LinkCache {      
        // Increment $mClassVer whenever old serialized versions of this class
        // becomes incompatible with the new version.
-       /* private */ var $mClassVer = 1; 
+       /* private */ var $mClassVer = 2;
 
        /* private */ var $mGoodLinks, $mBadLinks, $mActive;
-       /* private */ var $mImageLinks; 
+       /* private */ var $mImageLinks, $mCategoryLinks;
        /* private */ var $mPreFilled, $mOldGoodLinks, $mOldBadLinks;
        
        /* private */ function getKey( $title ) {
@@ -27,6 +27,7 @@ class LinkCache {
                $this->mGoodLinks = array();
                $this->mBadLinks = array();
                $this->mImageLinks = array();
+               $this->mCategoryLinks = array();
                $this->mOldGoodLinks = array();
                $this->mOldBadLinks = array();
        }
@@ -68,6 +69,14 @@ class LinkCache {
        {
                if ( $this->mActive ) { $this->mImageLinks[$nt->getDBkey()] = 1; }
        }
+       
+       function addCategoryLink( $title, $sortkey ) {
+               if ( $this->mActive ) { $this->mCategoryLinks[$title] = $sortkey; }
+       }
+       
+       function addCategoryLinkObj( &$nt, $sortkey ) {
+               $this->addCategoryLink( $nt->getDBkey(), $sortkey );
+       }
 
        function clearBadLink( $title )
        {
@@ -87,6 +96,7 @@ class LinkCache {
        function getGoodLinks() { return $this->mGoodLinks; }
        function getBadLinks() { return array_keys( $this->mBadLinks ); }
        function getImageLinks() { return $this->mImageLinks; }
+       function getCategoryLinks() { return $this->mCategoryLinks; }
 
        function addLink( $title )
        {
@@ -148,17 +158,27 @@ class LinkCache {
                $fname = "LinkCache::preFill";
                wfProfileIn( $fname );
                # Note -- $fromtitle is a Title *object*
-               $dbkeyfrom = wfStrencode( $fromtitle->getPrefixedDBKey() );
 
+               $this->suspend();
+               $id = $fromtitle->getArticleID();
+               $this->resume();
+               
+               if( $id == 0 ) {
+                       wfDebug( "$fname - got id 0 for title '" . $fromtitle->getPrefixedDBkey() . "'\n" );
+                       wfProfileOut( $fname );
+                       return;
+               }
+               
                if ( $wgEnablePersistentLC ) {
-                       if( $this->fillFromLinkscc( $dbkeyfrom ) ){
+                       if( $this->fillFromLinkscc( $id ) ){
+                               wfProfileOut( $fname );
                                return;
                        }
                }
 
                $sql = "SELECT cur_id,cur_namespace,cur_title
                        FROM cur,links
-                       WHERE cur_id=l_to AND l_from='{$dbkeyfrom}'";
+                       WHERE cur_id=l_to AND l_from=$id";
                $res = wfQuery( $sql, DB_READ, $fname );
                while( $s = wfFetchObject( $res ) ) {
                        $this->addGoodLink( $s->cur_id,
@@ -166,16 +186,6 @@ class LinkCache {
                                );
                }
                
-               $this->suspend();
-               $id = $fromtitle->getArticleID();
-               $this->resume();
-               
-               if( $id == 0 ) {
-                       wfDebug( "$fname - got id 0 for title '" . $fromtitle->getPrefixedDBkey() . "'\n" );
-                       wfProfileOut( $fname );
-                       return;
-               }
-               
                $sql = "SELECT bl_to
                        FROM brokenlinks
                        WHERE bl_from='{$id}'";
@@ -189,7 +199,7 @@ class LinkCache {
                $this->mPreFilled = true;
 
                if ( $wgEnablePersistentLC ) {
-                       $this->saveToLinkscc( $id, $dbkeyfrom );
+                       $this->saveToLinkscc( $id );
                }
                wfProfileOut( $fname );
        }
@@ -264,8 +274,9 @@ class LinkCache {
                $this->mImageLinks = array();
        }
 
-       /* private */ function fillFromLinkscc( $dbkeyfrom ){ 
-               $res = wfQuery("SELECT lcc_cacheobj FROM linkscc WHERE lcc_title = '{$dbkeyfrom}'", 
+       /* private */ function fillFromLinkscc( $id ){ 
+               $id = IntVal( $id );
+               $res = wfQuery("SELECT lcc_cacheobj FROM linkscc WHERE lcc_pageid = $id", 
                        DB_READ);
                $row = wfFetchObject( $res );
                if( $row == FALSE)
@@ -290,36 +301,62 @@ class LinkCache {
 
        }
 
-       /* private */ function saveToLinkscc( $pid, $dbkeyfrom ){
-               global $wgCompressedPersistentLC;
+       /* private */ function saveToLinkscc( $pid ){
+               global $wgCompressedPersistentLC, $wgIsMySQL;
                if( $wgCompressedPersistentLC and function_exists( "gzcompress" ) ) {
                        $ser = wfStrencode( gzcompress( serialize( $this ), 3 ));
                } else {
                        $ser = wfStrencode( serialize( $this ) );
                }
-               wfQuery("REPLACE INTO linkscc(lcc_pageid,lcc_title,lcc_cacheobj) " .
-                       "VALUES({$pid}, '{$dbkeyfrom}', '{$ser}')", DB_WRITE);
+               if ($wgIsMySQL) {
+                       wfQuery("REPLACE INTO linkscc(lcc_pageid,lcc_cacheobj) " .
+                               "VALUES({$pid}, '{$ser}')", DB_WRITE);
+               } else {
+                       wfQuery("DELETE FROM linkscc WHERE lcc_pageid={$pid}",DB_WRITE);
+                       wfQuery("INSERT INTO linkscc(lcc_pageid,lcc_cacheobj) " .
+                               "VALUES({$pid}, '{$ser}')", DB_WRITE);
+               }
        }
 
        # $pid is a page id
        /* static */ function linksccClearLinksTo( $pid ){
-               $pid = intval( $pid );
-               wfQuery("DELETE linkscc FROM linkscc,links ".
-                       "WHERE lcc_title=links.l_from AND l_to={$pid}", DB_WRITE);
-               wfQuery("DELETE FROM linkscc WHERE lcc_pageid='{$pid}'", DB_WRITE);
+               global $wgEnablePersistentLC, $wgIsMySQL;
+               if ( $wgEnablePersistentLC ) {
+                       $pid = intval( $pid );
+                       if ($wgIsMySQL) {
+                               wfQuery("DELETE linkscc FROM linkscc,links ".
+                                       "WHERE lcc_pageid=links.l_from AND l_to={$pid}", DB_WRITE);
+                       } else {
+                               wfQuery("DELETE FROM linkscc WHERE lcc_pageid IN ".
+                                       "(SELECT l_from FROM links WHERE l_to={$pid}", DB_WRITE);
+                       }
+                       wfQuery("DELETE FROM linkscc WHERE lcc_pageid='{$pid}')", DB_WRITE);
+               }
        }
 
        # $title is a prefixed db title, for example like Title->getPrefixedDBkey() returns.
        /* static */ function linksccClearBrokenLinksTo( $title ){
-               $title = wfStrencode( $title );
-               wfQuery("DELETE linkscc FROM linkscc,brokenlinks ".
-                       "WHERE lcc_pageid=bl_from AND bl_to='{$title}'", DB_WRITE);
+               global $wgEnablePersistentLC,$wgIsMySQL;
+               if ( $wgEnablePersistentLC ) {
+                       $title = wfStrencode( $title );
+                       if ($wgIsMySQL) {
+                               wfQuery("DELETE linkscc FROM linkscc,brokenlinks ".
+                                       "WHERE lcc_pageid=bl_from AND bl_to='{$title}'", DB_WRITE);
+                       } else {
+                               wfQuery("DELETE FROM linkscc WHERE lcc_pageid IN ".
+                                       "(SELECT bl_from FROM brokenlinks ".
+                                       "WHERE bl_to='{$title}')",DB_WRITE);
+                       }
+               }
        }
 
        # $pid is a page id
        /* static */ function linksccClearPage( $pid ){
-               $pid = intval( $pid );
-               wfQuery("DELETE FROM linkscc WHERE lcc_pageid='{$pid}'", DB_WRITE);
+               global $wgEnablePersistentLC;
+               if ( $wgEnablePersistentLC ) {
+                       $pid = intval( $pid );
+                       wfQuery("DELETE FROM linkscc WHERE lcc_pageid='{$pid}'", DB_WRITE);
+               }
        }
 }
 ?>