X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLinksUpdate.php;h=38ed4cb4f41b0d2ff0be0d6384fcf51ccbf027f4;hb=bcb3547848cf27868fa4b9afa2d1b8ffec08c491;hp=23c30cd9731db733fb93fb14e6f9650f4769e6b5;hpb=dc9d39887eff97a01903ad0ed5e8e9612333ca13;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php index 23c30cd973..38ed4cb4f4 100644 --- a/includes/LinksUpdate.php +++ b/includes/LinksUpdate.php @@ -29,7 +29,6 @@ class LinksUpdate { $mLinks, //!< Map of title strings to IDs for the links in the document $mImages, //!< DB keys of the images used, in the array key only $mTemplates, //!< Map of title strings to IDs for the template references, including broken ones - $mDistantTemplates,//!< Map of title strings to IDs for the distant template references, including broken ones $mExternals, //!< URLs of external links, array key only $mCategories, //!< Map of category names to sort keys $mInterlangs, //!< Map of language codes to titles @@ -67,7 +66,6 @@ class LinksUpdate { $this->mLinks = $parserOutput->getLinks(); $this->mImages = $parserOutput->getImages(); $this->mTemplates = $parserOutput->getTemplates(); - $this->mDistantTemplates = $parserOutput->getDistantTemplates(); $this->mExternals = $parserOutput->getExternalLinks(); $this->mCategories = $parserOutput->getCategories(); $this->mProperties = $parserOutput->getProperties(); @@ -137,7 +135,7 @@ class LinksUpdate { # External links $existing = $this->getExistingExternals(); $this->incrTableUpdate( 'externallinks', 'el', $this->getExternalDeletions( $existing ), - $this->getExternalInsertions( $existing ) ); + $this->getExternalInsertions( $existing ) ); # Language links $existing = $this->getExistingInterlangs(); @@ -154,15 +152,6 @@ class LinksUpdate { $this->incrTableUpdate( 'templatelinks', 'tl', $this->getTemplateDeletions( $existing ), $this->getTemplateInsertions( $existing ) ); - # Distant template links - global $wgGlobalDB; - if ( $wgGlobalDB ) { - $existing = $this->getDistantExistingTemplates(); - $this->incrSharedTableUpdate( 'globaltemplatelinks', 'gtl', - $this->getDistantTemplateDeletions( $existing ), - $this->getDistantTemplateInsertions( $existing ) ); - } - # Category links $existing = $this->getExistingCategories(); @@ -252,6 +241,7 @@ class LinksUpdate { foreach ( $batches as $batch ) { list( $start, $end ) = $batch; $params = array( + 'table' => 'templatelinks', 'start' => $start, 'end' => $end, ); @@ -307,27 +297,38 @@ class LinksUpdate { ); } + /** + * @param $cats + */ function invalidateCategories( $cats ) { $this->invalidatePages( NS_CATEGORY, array_keys( $cats ) ); } /** * Update all the appropriate counts in the category table. - * @param $added associative array of category name => sort key - * @param $deleted associative array of category name => sort key + * @param $added array associative array of category name => sort key + * @param $deleted array associative array of category name => sort key */ function updateCategoryCounts( $added, $deleted ) { - $a = new Article($this->mTitle); + $a = WikiPage::factory( $this->mTitle ); $a->updateCategoryCounts( array_keys( $added ), array_keys( $deleted ) ); } + /** + * @param $images + */ function invalidateImageDescriptions( $images ) { $this->invalidatePages( NS_FILE, array_keys( $images ) ); } - function dumbTableUpdate( $table, $insertions, $fromField ) { + /** + * @param $table + * @param $insertions + * @param $fromField + */ + private function dumbTableUpdate( $table, $insertions, $fromField ) { $this->mDb->delete( $table, array( $fromField => $this->mId ), __METHOD__ ); if ( count( $insertions ) ) { # The link array was constructed without FOR UPDATE, so there may @@ -339,7 +340,10 @@ class LinksUpdate { /** * Update a table by doing a delete query then an insert query - * @private + * @param $table + * @param $prefix + * @param $deletions + * @param $insertions */ function incrTableUpdate( $table, $prefix, $deletions, $insertions ) { if ( $table == 'page_props' ) { @@ -378,51 +382,17 @@ class LinksUpdate { $this->mDb->delete( $table, $where, __METHOD__ ); } if ( count( $insertions ) ) { - $this->mDb->insert( 'globaltemplatelinks', $insertions['globaltemplatelinks'], __METHOD__, 'IGNORE' ); - $this->mDb->insert( 'globalnamespaces', $insertions['globalnamespaces'], __METHOD__, 'IGNORE' ); - $this->mDb->insert( 'globalinterwiki', $insertions['globalinterwiki'], __METHOD__, 'IGNORE' ); - } - } - - /** - * Update a shared table by doing a delete query then an insert query - * @private - */ - function incrSharedTableUpdate( $table, $prefix, $deletions, $insertions ) { - - global $wgWikiID; - global $wgGlobalDB; - - if ( $wgGlobalDB ) { - $dbw = wfGetDB( DB_MASTER, array(), $wgGlobalDB ); - $where = array( "{$prefix}_from_wiki" => $wgWikiID, - "{$prefix}_from_page" => $this->mId - ); - $baseKey = "{$prefix}_to_wiki"; - $middleKey = "{$prefix}_to_namespace"; - - $clause = $dbw->makeWhereFrom3d( $deletions, $baseKey, $middleKey, "{$prefix}_to_title" ); - if ( $clause ) { - $where[] = $clause; - } else { - $where = false; - } - - if ( $where ) { - $dbw->delete( $table, $where, __METHOD__ ); - } - if ( count( $insertions ) ) { - $dbw->insert( $table, $insertions, __METHOD__, 'IGNORE' ); - } + $this->mDb->insert( $table, $insertions, __METHOD__, 'IGNORE' ); } } /** * Get an array of pagelinks insertions for passing to the DB * Skips the titles specified by the 2-D array $existing - * @private + * @param $existing array + * @return array */ - function getLinkInsertions( $existing = array() ) { + private function getLinkInsertions( $existing = array() ) { $arr = array(); foreach( $this->mLinks as $ns => $dbkeys ) { $diffs = isset( $existing[$ns] ) @@ -441,9 +411,10 @@ class LinksUpdate { /** * Get an array of template insertions. Like getLinkInsertions() - * @private + * @param $existing array + * @return array */ - function getTemplateInsertions( $existing = array() ) { + private function getTemplateInsertions( $existing = array() ) { $arr = array(); foreach( $this->mTemplates as $ns => $dbkeys ) { $diffs = isset( $existing[$ns] ) ? array_diff_key( $dbkeys, $existing[$ns] ) : $dbkeys; @@ -458,51 +429,13 @@ class LinksUpdate { return $arr; } - /** - * Get an array of distant template insertions. Like getLinkInsertions() - * @private - */ - function getDistantTemplateInsertions( $existing = array() ) { - global $wgWikiID; - $arr = array(); - foreach( $this->mDistantTemplates as $wikiid => $templatesToNS ) { - foreach( $templatesToNS as $ns => $dbkeys ) { - $diffs = isset( $existing[$wikiid] ) && isset( $existing[$wikiid][$ns] ) - ? array_diff_key( $dbkeys, $existing[$wikiid][$ns] ) - : $dbkeys; - $interwiki = Interwiki::fetch( $wikiid ); - $wikiid = $interwiki->getWikiID(); - foreach ( $diffs as $dbk => $id ) { - $arr['globaltemplatelinks'][] = array( - 'gtl_from_wiki' => $wgWikiID, - 'gtl_from_page' => $this->mId, - 'gtl_from_namespace' => $this->mTitle->getNamespace(), - 'gtl_from_title' => $this->mTitle->getText(), - 'gtl_to_wiki' => $wikiid, - 'gtl_to_namespace' => $ns, - 'gtl_to_title' => $dbk - ); - $arr['globalinterwiki'][] = array( - 'giw_wikiid' => $wikiid, - 'giw_prefix' => $prefix - ); - $arr['globalnamespaces'][] = array( - 'gn_wiki' => wfWikiID( ), - 'gn_namespace' => $this->mTitle->getNamespace(), - 'gn_namespacetext' => $this->mTitle->getNsText(), - ); - } - } - } - return $arr; - } - /** * Get an array of image insertions * Skips the names specified in $existing - * @private + * @param $existing array + * @return array */ - function getImageInsertions( $existing = array() ) { + private function getImageInsertions( $existing = array() ) { $arr = array(); $diffs = array_diff_key( $this->mImages, $existing ); foreach( $diffs as $iname => $dummy ) { @@ -516,17 +449,20 @@ class LinksUpdate { /** * Get an array of externallinks insertions. Skips the names specified in $existing - * @private + * @param $existing array + * @return array */ - function getExternalInsertions( $existing = array() ) { + private function getExternalInsertions( $existing = array() ) { $arr = array(); $diffs = array_diff_key( $this->mExternals, $existing ); foreach( $diffs as $url => $dummy ) { - $arr[] = array( - 'el_from' => $this->mId, - 'el_to' => $url, - 'el_index' => wfMakeUrlIndex( $url ), - ); + foreach( wfMakeUrlIndexes( $url ) as $index ) { + $arr[] = array( + 'el_from' => $this->mId, + 'el_to' => $url, + 'el_index' => $index, + ); + } } return $arr; } @@ -534,11 +470,12 @@ class LinksUpdate { /** * Get an array of category insertions * - * @param $existing Array mapping existing category names to sort keys. If both + * @param $existing array mapping existing category names to sort keys. If both * match a link in $this, the link will be omitted from the output - * @private + * + * @return array */ - function getCategoryInsertions( $existing = array() ) { + private function getCategoryInsertions( $existing = array() ) { global $wgContLang, $wgCategoryCollation; $diffs = array_diff_assoc( $this->mCategories, $existing ); $arr = array(); @@ -578,23 +515,26 @@ class LinksUpdate { * Get an array of interlanguage link insertions * * @param $existing Array mapping existing language codes to titles - * @private + * + * @return array */ - function getInterlangInsertions( $existing = array() ) { - $diffs = array_diff_assoc( $this->mInterlangs, $existing ); - $arr = array(); - foreach( $diffs as $lang => $title ) { - $arr[] = array( - 'll_from' => $this->mId, - 'll_lang' => $lang, - 'll_title' => $title - ); - } - return $arr; + private function getInterlangInsertions( $existing = array() ) { + $diffs = array_diff_assoc( $this->mInterlangs, $existing ); + $arr = array(); + foreach( $diffs as $lang => $title ) { + $arr[] = array( + 'll_from' => $this->mId, + 'll_lang' => $lang, + 'll_title' => $title + ); + } + return $arr; } /** * Get an array of page property insertions + * @param $existing array + * @return array */ function getPropertyInsertions( $existing = array() ) { $diffs = array_diff_assoc( $this->mProperties, $existing ); @@ -612,9 +552,10 @@ class LinksUpdate { /** * Get an array of interwiki insertions for passing to the DB * Skips the titles specified by the 2-D array $existing - * @private + * @param $existing array + * @return array */ - function getInterwikiInsertions( $existing = array() ) { + private function getInterwikiInsertions( $existing = array() ) { $arr = array(); foreach( $this->mInterwikis as $prefix => $dbkeys ) { $diffs = isset( $existing[$prefix] ) ? array_diff_key( $dbkeys, $existing[$prefix] ) : $dbkeys; @@ -632,9 +573,10 @@ class LinksUpdate { /** * Given an array of existing links, returns those links which are not in $this * and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getLinkDeletions( $existing ) { + private function getLinkDeletions( $existing ) { $del = array(); foreach ( $existing as $ns => $dbkeys ) { if ( isset( $this->mLinks[$ns] ) ) { @@ -649,9 +591,10 @@ class LinksUpdate { /** * Given an array of existing templates, returns those templates which are not in $this * and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getTemplateDeletions( $existing ) { + private function getTemplateDeletions( $existing ) { $del = array(); foreach ( $existing as $ns => $dbkeys ) { if ( isset( $this->mTemplates[$ns] ) ) { @@ -663,69 +606,50 @@ class LinksUpdate { return $del; } - /** - * Given an array of existing templates, returns those templates which are not in $this - * and thus should be deleted. - * @private - */ - function getDistantTemplateDeletions( $existing ) { - $del = array(); - foreach ( $existing as $wikiid => $templatesForNS ) { - if ( isset( $this->mDistantTemplates[$wikiid] ) ) { - $del[$wikiid] = array_diff_key( $existing[$wikiid], $this->mDistantTemplates[$wikiid] ); - } else { - $del[$wikiid] = $existing[$wikiid]; - } - foreach ( $templatesForNS as $ns => $dbkeys ) { - if ( isset( $this->mDistantTemplates[$wikiid][$ns] ) ) { - $del[$wikiid][$ns] = array_diff_key( $existing[$wikiid][$ns], $this->mDistantTemplates[$wikiid][$ns] ); - } else { - $del[$wikiid][$ns] = $existing[$wikiid][$ns]; - } - } - } - return $del; - } - /** * Given an array of existing images, returns those images which are not in $this * and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getImageDeletions( $existing ) { + private function getImageDeletions( $existing ) { return array_diff_key( $existing, $this->mImages ); } /** * Given an array of existing external links, returns those links which are not * in $this and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getExternalDeletions( $existing ) { + private function getExternalDeletions( $existing ) { return array_diff_key( $existing, $this->mExternals ); } /** * Given an array of existing categories, returns those categories which are not in $this * and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getCategoryDeletions( $existing ) { + private function getCategoryDeletions( $existing ) { return array_diff_assoc( $existing, $this->mCategories ); } /** * Given an array of existing interlanguage links, returns those links which are not * in $this and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getInterlangDeletions( $existing ) { - return array_diff_assoc( $existing, $this->mInterlangs ); + private function getInterlangDeletions( $existing ) { + return array_diff_assoc( $existing, $this->mInterlangs ); } /** * Get array of properties which should be deleted. - * @private + * @param $existing array + * @return array */ function getPropertyDeletions( $existing ) { return array_diff_assoc( $existing, $this->mProperties ); @@ -734,9 +658,10 @@ class LinksUpdate { /** * Given an array of existing interwiki links, returns those links which are not in $this * and thus should be deleted. - * @private + * @param $existing array + * @return array */ - function getInterwikiDeletions( $existing ) { + private function getInterwikiDeletions( $existing ) { $del = array(); foreach ( $existing as $prefix => $dbkeys ) { if ( isset( $this->mInterwikis[$prefix] ) ) { @@ -750,9 +675,10 @@ class LinksUpdate { /** * Get an array of existing links, as a 2-D array - * @private + * + * @return array */ - function getExistingLinks() { + private function getExistingLinks() { $res = $this->mDb->select( 'pagelinks', array( 'pl_namespace', 'pl_title' ), array( 'pl_from' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -767,9 +693,10 @@ class LinksUpdate { /** * Get an array of existing templates, as a 2-D array - * @private + * + * @return array */ - function getExistingTemplates() { + private function getExistingTemplates() { $res = $this->mDb->select( 'templatelinks', array( 'tl_namespace', 'tl_title' ), array( 'tl_from' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -782,38 +709,12 @@ class LinksUpdate { return $arr; } - /** - * Get an array of existing distant templates, as a 3-D array - * @private - */ - function getDistantExistingTemplates() { - global $wgWikiID; - global $wgGlobalDB; - - $arr = array(); - if ( $wgGlobalDB ) { - $dbr = wfGetDB( DB_SLAVE, array(), $wgGlobalDB ); - $res = $dbr->select( 'globaltemplatelinks', array( 'gtl_to_wiki', 'gtl_to_namespace', 'gtl_to_title' ), - array( 'gtl_from_wiki' => $wgWikiID, 'gtl_from_page' => $this->mId ), __METHOD__, $this->mOptions ); - while ( $row = $dbr->fetchObject( $res ) ) { - if ( !isset( $arr[$row->gtl_to_wiki] ) ) { - $arr[$row->gtl_to_wiki] = array(); - } - if ( !isset( $arr[$row->gtl_to_wiki][$row->gtl_to_namespace] ) ) { - $arr[$row->gtl_to_wiki][$row->gtl_to_namespace] = array(); - } - $arr[$row->gtl_to_wiki][$row->gtl_to_namespace][$row->gtl_to_title] = 1; - } - $dbr->freeResult( $res ); - } - return $arr; - } - /** * Get an array of existing images, image names in the keys - * @private + * + * @return array */ - function getExistingImages() { + private function getExistingImages() { $res = $this->mDb->select( 'imagelinks', array( 'il_to' ), array( 'il_from' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -825,9 +726,10 @@ class LinksUpdate { /** * Get an array of existing external links, URLs in the keys - * @private + * + * @return array */ - function getExistingExternals() { + private function getExistingExternals() { $res = $this->mDb->select( 'externallinks', array( 'el_to' ), array( 'el_from' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -839,9 +741,10 @@ class LinksUpdate { /** * Get an array of existing categories, with the name in the key and sort key in the value. - * @private + * + * @return array */ - function getExistingCategories() { + private function getExistingCategories() { $res = $this->mDb->select( 'categorylinks', array( 'cl_to', 'cl_sortkey_prefix' ), array( 'cl_from' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -854,9 +757,10 @@ class LinksUpdate { /** * Get an array of existing interlanguage links, with the language code in the key and the * title in the value. - * @private + * + * @return array */ - function getExistingInterlangs() { + private function getExistingInterlangs() { $res = $this->mDb->select( 'langlinks', array( 'll_lang', 'll_title' ), array( 'll_from' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -885,9 +789,10 @@ class LinksUpdate { /** * Get an array of existing categories, with the name in the key and sort key in the value. - * @private + * + * @return array */ - function getExistingProperties() { + private function getExistingProperties() { $res = $this->mDb->select( 'page_props', array( 'pp_propname', 'pp_value' ), array( 'pp_page' => $this->mId ), __METHOD__, $this->mOptions ); $arr = array(); @@ -897,16 +802,17 @@ class LinksUpdate { return $arr; } - /** * Return the title object of the page being updated + * @return Title */ - function getTitle() { + public function getTitle() { return $this->mTitle; } /** * Return the list of images used as generated by the parser + * @return array */ public function getImages() { return $this->mImages; @@ -914,8 +820,9 @@ class LinksUpdate { /** * Invalidate any necessary link lists related to page property changes + * @param $changed */ - function invalidateProperties( $changed ) { + private function invalidateProperties( $changed ) { global $wgPagePropLinkInvalidations; foreach ( $changed as $name => $value ) {