From 29d422d0077b75f043945f9a9e7e5420a7913f13 Mon Sep 17 00:00:00 2001
From: crackcraft <crackcraft@gmail.com>
Date: Tue, 26 Dec 2023 22:30:26 +0300
Subject: [PATCH 1/2] use png for thumbnails
---
.../src/main/java/info/xonix/zlo/web/logic/ImgLogic.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zlo_web/src/main/java/info/xonix/zlo/web/logic/ImgLogic.java b/zlo_web/src/main/java/info/xonix/zlo/web/logic/ImgLogic.java
index c7cb72c6..7cdcb2dc 100644
--- a/zlo_web/src/main/java/info/xonix/zlo/web/logic/ImgLogic.java
+++ b/zlo_web/src/main/java/info/xonix/zlo/web/logic/ImgLogic.java
@@ -62,7 +62,7 @@ public static void renderPreviewAndCache(String url, HttpServletResponse resp, S
err = true;
} else {
// log.info("renderPreviewAndCache " + url + ": cached");
- resp.setContentType("image/jpeg");
+ resp.setContentType("image/png");
FileUtils.copyFile(previewFile, outputStream);
}
} else {
@@ -81,9 +81,9 @@ public static void renderPreviewAndCache(String url, HttpServletResponse resp, S
err = true;
}
if (previewImg != null) {
- resp.setContentType("image/jpeg");
- ImageIO.write(previewImg, "jpg", previewFile);
- ImageIO.write(previewImg, "jpg", outputStream);
+ resp.setContentType("image/png");
+ ImageIO.write(previewImg, "png", previewFile);
+ ImageIO.write(previewImg, "png", outputStream);
}
}
} catch (Exception e) {
From e4cde995873854166e25d2a8731a6eea363481a8 Mon Sep 17 00:00:00 2001
From: crackcraft <crackcraft@gmail.com>
Date: Tue, 26 Dec 2023 22:40:02 +0300
Subject: [PATCH 2/2] fix mysql 5.7 group by
---
.../SQL/base_tables/create_table_nickhost.sql | 2 +-
zlo_search/DB Scripts/misc/fixNicks.sql | 2 +-
zlo_search/DB Scripts/move_to_one_db.sql | 6 +++---
zlo_search/DB Scripts/move_to_one_db_create.py | 2 +-
.../DB Scripts/move_to_one_db_generated.sql | 16 ++++++++--------
zlo_web/src/main/webapp/stats.jsp | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/zlo_search/DB Scripts/SQL/base_tables/create_table_nickhost.sql b/zlo_search/DB Scripts/SQL/base_tables/create_table_nickhost.sql
index f1c12ec7..b430c258 100644
--- a/zlo_search/DB Scripts/SQL/base_tables/create_table_nickhost.sql
+++ b/zlo_search/DB Scripts/SQL/base_tables/create_table_nickhost.sql
@@ -15,7 +15,7 @@ ALTER TABLE nickhost ADD INDEX idx_host (host);
-- initial
insert into nickhost (nick, host, reg, cnt)
select nick, host, reg, count(1) cnt from messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS trigger_nickhost;
diff --git a/zlo_search/DB Scripts/misc/fixNicks.sql b/zlo_search/DB Scripts/misc/fixNicks.sql
index 3a0b3774..6405db41 100644
--- a/zlo_search/DB Scripts/misc/fixNicks.sql
+++ b/zlo_search/DB Scripts/misc/fixNicks.sql
@@ -5,4 +5,4 @@ delete from nickhost;
insert into nickhost (nick, host, reg, cnt)
select nick, host, reg, count(1) cnt from messages
-group by nick, host;
\ No newline at end of file
+group by nick, host, reg;
\ No newline at end of file
diff --git a/zlo_search/DB Scripts/move_to_one_db.sql b/zlo_search/DB Scripts/move_to_one_db.sql
index ab8f4058..0821e4e4 100644
--- a/zlo_search/DB Scripts/move_to_one_db.sql
+++ b/zlo_search/DB Scripts/move_to_one_db.sql
@@ -86,7 +86,7 @@ ALTER TABLE anime_nickhost ADD INDEX idx_host (host);
-- initial
insert into anime_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(1) cnt from anime_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS anime_trigger_nickhost;
@@ -159,7 +159,7 @@ ALTER TABLE velo_nickhost ADD INDEX idx_host (host);
-- initial
insert into velo_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(1) cnt from velo_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS velo_trigger_nickhost;
@@ -232,7 +232,7 @@ ALTER TABLE sport_nickhost ADD INDEX idx_host (host);
-- initial
insert into sport_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(1) cnt from sport_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS sport_trigger_nickhost;
diff --git a/zlo_search/DB Scripts/move_to_one_db_create.py b/zlo_search/DB Scripts/move_to_one_db_create.py
index 11cbc587..4333e172 100644
--- a/zlo_search/DB Scripts/move_to_one_db_create.py
+++ b/zlo_search/DB Scripts/move_to_one_db_create.py
@@ -103,7 +103,7 @@
-- initial
insert into %(site)s_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from %(site)s_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS %(site)s_trigger_nickhost;
diff --git a/zlo_search/DB Scripts/move_to_one_db_generated.sql b/zlo_search/DB Scripts/move_to_one_db_generated.sql
index 636020c9..ed9b83c1 100644
--- a/zlo_search/DB Scripts/move_to_one_db_generated.sql
+++ b/zlo_search/DB Scripts/move_to_one_db_generated.sql
@@ -87,7 +87,7 @@ ALTER TABLE anime_nickhost ADD INDEX idx_host (host);
-- initial
insert into anime_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from anime_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS anime_trigger_nickhost;
@@ -160,7 +160,7 @@ ALTER TABLE dev_nickhost ADD INDEX idx_host (host);
-- initial
insert into dev_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from dev_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS dev_trigger_nickhost;
@@ -233,7 +233,7 @@ ALTER TABLE games_nickhost ADD INDEX idx_host (host);
-- initial
insert into games_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from games_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS games_trigger_nickhost;
@@ -306,7 +306,7 @@ ALTER TABLE np_nickhost ADD INDEX idx_host (host);
-- initial
insert into np_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from np_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS np_trigger_nickhost;
@@ -379,7 +379,7 @@ ALTER TABLE sport_nickhost ADD INDEX idx_host (host);
-- initial
insert into sport_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from sport_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS sport_trigger_nickhost;
@@ -452,7 +452,7 @@ ALTER TABLE takeoff_nickhost ADD INDEX idx_host (host);
-- initial
insert into takeoff_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from takeoff_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS takeoff_trigger_nickhost;
@@ -525,7 +525,7 @@ ALTER TABLE velo_nickhost ADD INDEX idx_host (host);
-- initial
insert into velo_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from velo_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS velo_trigger_nickhost;
@@ -598,7 +598,7 @@ ALTER TABLE zlo_nickhost ADD INDEX idx_host (host);
-- initial
insert into zlo_nickhost (nick, host, reg, cnt)
select nick, host, reg, count(*) cnt from zlo_messages
-group by nick, host;
+group by nick, host, reg;
-- trigger
DROP TRIGGER IF EXISTS zlo_trigger_nickhost;
diff --git a/zlo_web/src/main/webapp/stats.jsp b/zlo_web/src/main/webapp/stats.jsp
index 94e04013..894b0ce4 100644
--- a/zlo_web/src/main/webapp/stats.jsp
+++ b/zlo_web/src/main/webapp/stats.jsp
@@ -32,7 +32,7 @@
<c:when test="${byNick}">
<sql:query var="res">
select nick, user_id, reg, COUNT(*) cnt from ${messagesTbl}${' '}${msgDateWhereClause}
- group by nick
+ group by nick, user_id, reg
order by cnt desc;
<sql:param>${periodDays}</sql:param>
</sql:query>