From eae9a3e2f44aa3e37e8b763fefa655287204e5a7 Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 7 Feb 2021 11:26:46 +0000 Subject: [PATCH] Remove master index digest column from the web page It isn't really necessary now we have the download links. Signed-off-by: Graham --- .../org/openrs2/archive/cache/CacheExporter.kt | 14 ++++++-------- .../openrs2/archive/templates/caches/index.html | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt index 7313f489..be5a28a6 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt @@ -19,7 +19,6 @@ public class CacheExporter @Inject constructor( ) { public data class Cache( val id: Long, - val whirlpool: ByteArray, val game: String, val build: Int?, val timestamp: Instant?, @@ -39,7 +38,7 @@ public class CacheExporter @Inject constructor( return database.execute { connection -> connection.prepareStatement( """ - SELECT m.id, c.whirlpool, g.name, m.build, m.timestamp, m.name + SELECT m.id, g.name, m.build, m.timestamp, m.name FROM master_indexes m JOIN games g ON g.id = m.game_id JOIN containers c ON c.id = m.container_id @@ -51,18 +50,17 @@ public class CacheExporter @Inject constructor( while (rows.next()) { val id = rows.getLong(1) - val whirlpool = rows.getBytes(2) - val game = rows.getString(3) + val game = rows.getString(2) - var build: Int? = rows.getInt(4) + var build: Int? = rows.getInt(3) if (rows.wasNull()) { build = null } - val timestamp = rows.getTimestamp(5)?.toInstant() - val name = rows.getString(6) + val timestamp = rows.getTimestamp(4)?.toInstant() + val name = rows.getString(5) - caches += Cache(id, whirlpool, game, build, timestamp, name) + caches += Cache(id, game, build, timestamp, name) } caches diff --git a/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html b/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html index acf2af6e..0a4fad17 100644 --- a/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html +++ b/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html @@ -4,7 +4,6 @@ - @@ -15,7 +14,6 @@ -
Master index digest Game Build Timestamp
00000000 runescape 550