Updated to match new DB structure

Designburo · Designburo · commit cf8659a6e301 · 2024-01-17T21:32:52.000+01:00
diff --git a/includes/data/Structure.php b/includes/data/Structure.php
@@ -25,8 +25,9 @@ class Structure {
 	public const WIKI_DEFUNCT = 'w8y_wi_is_defunct';
 	public const WIKI_LAST_SR_RCRD = 'w8y_wi_last_sr_id';
 	public const SR_ID = 'w8y_sr_sr_id';
-	public const EXTENSION_SCRAPE_ID = 'w8y_ex_sr_id';
-	public const SKIN_SCRAPE_ID = 'w8y_sk_sr_id';
+	public const SCRAPE_VR_ID = 'w8y_sr_vr_id';
+	public const EXTENSION_VERSION_ID = 'w8y_ex_vr_id';
+	public const SKIN_VERSION_ID = 'w8y_sk_vr_id';
 	public const SCRAPE_MEDIAWIKI_VERSION = 'w8y_sr_mw_version';
 
 	/**
diff --git a/includes/data/query/Wiki.php b/includes/data/query/Wiki.php
@@ -34,10 +34,10 @@ public function __construct() {
 	 *
 	 * @return array
 	 */
-	private function getExtensions( int $scrapeId, DBConnRef $dbr ): array {
+	private function getExtensions( int $versionId, DBConnRef $dbr ): array {
 		$select = [ '*' ];
 		$from = Structure::DBTABLE_EXTENSIONS;
-		$where = [ Structure::EXTENSION_SCRAPE_ID => $scrapeId ];
+		$where = [ Structure::EXTENSION_VERSION_ID => $versionId ];
 		$res = $dbr->newSelectQueryBuilder()->select( $select )->from( $from )->
 		where( $where )->caller( __METHOD__ )->fetchResultSet();
 
@@ -60,10 +60,10 @@ private function getExtensions( int $scrapeId, DBConnRef $dbr ): array {
 	 *
 	 * @return array
 	 */
-	private function getSkins( int $scrapeId, DBConnRef $dbr ): array {
+	private function getSkins( int $versionId, DBConnRef $dbr ): array {
 		$select = [ '*' ];
 		$from = Structure::DBTABLE_SKINS;
-		$where = [ Structure::SKIN_SCRAPE_ID => $scrapeId ];
+		$where = [ Structure::SKIN_VERSION_ID => $versionId ];
 		$res = $dbr->newSelectQueryBuilder()->select( $select )->from( $from )->
 		where( $where )->caller( __METHOD__ )->fetchResultSet();
 
@@ -135,8 +135,8 @@ public function doQuery( int $pageID, string $export = "table" ): mixed {
 			return $result;
 		}
 		$result['wiki']['pageTitle'] = Utils::getPageTitleFromID( $pageID );
-		$result['extensions'] = $this->getExtensions( $result['scrape'][Structure::SR_ID], $dbr );
-		$result['skins'] = $this->getSkins( $result['scrape'][Structure::SR_ID], $dbr );
+		$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,
