Catch action=wiki and scrapes with no version id

Designburo · Designburo · commit 6d1afb4e72b0 · 2024-01-29T20:36:26.000+01:00
diff --git a/includes/data/Structure.php b/includes/data/Structure.php
@@ -28,6 +28,7 @@ class Structure {
 	public const WIKI_LAST_SR_RCRD = 'w8y_wi_last_sr_id';
 	public const SR_ID = 'w8y_sr_sr_id';
 	public const SCRAPE_VR_ID = 'w8y_sr_vr_id';
+	public const SCRAPE_IS_ALIVE = 'w8y_sr_is_alive';
 	public const EXTENSION_ID = 'w8y_ed_ed_id';
 	public const EXTENSION_NAME = 'w8y_ed_name';
 	public const EXTENSION_LINK_VID = 'w8y_el_vr_id';
diff --git a/includes/data/query/Wiki.php b/includes/data/query/Wiki.php
@@ -38,10 +38,13 @@ private function getExtensions( int $versionId, DBConnRef $dbr ): array {
 		$select = [ '*' ];
 		$from = Structure::DBTABLE_EXTENSIONS_LINK;
 		$where = [ Structure::DBTABLE_EXTENSIONS_LINK . '.' . Structure::EXTENSION_LINK_VID => $versionId ];
-		$res = $dbr->newSelectQueryBuilder()->select( $select )->from( $from )->join( Structure::DBTABLE_EXTENSIONS,
-			null,
-			Structure::DBTABLE_EXTENSIONS_LINK . '.' . Structure::EXTENSION_LINK_ID . ' = ' . Structure::DBTABLE_EXTENSIONS . '.' . Structure::EXTENSION_ID )
-			->where( $where )->caller( __METHOD__ )->fetchResultSet();
+		$res = $dbr->newSelectQueryBuilder()->
+		select( $select )->
+		from( $from )->
+		join( Structure::DBTABLE_EXTENSIONS, null, Structure::DBTABLE_EXTENSIONS_LINK . '.' . Structure::EXTENSION_LINK_ID . ' = ' . Structure::DBTABLE_EXTENSIONS . '.' . Structure::EXTENSION_ID )->
+		where( $where )->
+		caller( __METHOD__ )->
+		fetchResultSet();
 
 		$ret = [];
 		$t = 0;
@@ -66,10 +69,13 @@ private function getSkins( int $versionId, DBConnRef $dbr ): array {
 		$select = [ '*' ];
 		$from = Structure::DBTABLE_SKINS_LINK;
 		$where = [ Structure::DBTABLE_SKINS_LINK . '.' . Structure::SKIN_LINK_VID => $versionId ];
-		$res = $dbr->newSelectQueryBuilder()->select( $select )->from( $from )->join( Structure::DBTABLE_SKINS,
-			null,
-			Structure::DBTABLE_SKINS_LINK . '.' . Structure::SKIN_LINK_ID . ' = ' . Structure::DBTABLE_SKINS . '.' . Structure::SKIN_ID )
-			->where( $where )->caller( __METHOD__ )->fetchResultSet();
+		$res = $dbr->newSelectQueryBuilder()->
+		select( $select )->
+		from( $from )->
+		join( Structure::DBTABLE_SKINS, null,	Structure::DBTABLE_SKINS_LINK . '.' . Structure::SKIN_LINK_ID . ' = ' . Structure::DBTABLE_SKINS . '.' . Structure::SKIN_ID )->
+		where( $where )->
+		caller( __METHOD__ )->
+		fetchResultSet();
 
 		$ret = [];
 		$t = 0;
@@ -143,10 +149,16 @@ public function doQuery( int $pageID, string $export = "table" ): mixed {
 			return $result;
 		}
 		$result['wiki']['w8y_pageTitle'] = Utils::getPageTitleFromID( $pageID );
-		$result['extensions'] = $this->getExtensions( $result['scrape'][Structure::SCRAPE_VR_ID], $dbr );
+		if ( $result['scrape'][Structure::SCRAPE_IS_ALIVE] === 0 ) {
+			$result['extensions'] = [];
+			$result['skins'] = [];
+		} else {
+			$result['extensions'] = $this->getExtensions( $result['scrape'][Structure::SCRAPE_VR_ID], $dbr );
+			$result['skins'] = $this->getSkins( $result['scrape'][Structure::SCRAPE_VR_ID], $dbr );
+		}
 		return match ( $export ) {
 			"table" => Utils::renderTable( $result,
-				'Results for ' . $result['wiki']['pageTitle'] . ' ( pageID: ' . $pageID . ' )' ),
+				'Results for ' . $result['wiki']['w8y_pageTitle'] . ' ( pageID: ' . $pageID . ' )' ),
 			"arrayfunctions" => [ Utils::exportArrayFunction( $result ), 'nowiki' => true ],
 			"lua" => $result,
 			default => "",
