From f43e9dbaa28ca8241b9b27d5dbbb5a6afd96553e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 16 Dec 2019 01:46:47 +1100 Subject: minimaws: add software list support to web-based romident (nw) also removed unused member that was breaking clang builds --- scripts/minimaws/lib/dbaccess.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/minimaws/lib/dbaccess.py') diff --git a/scripts/minimaws/lib/dbaccess.py b/scripts/minimaws/lib/dbaccess.py index 80bfabb92a5..68bdc98901b 100644 --- a/scripts/minimaws/lib/dbaccess.py +++ b/scripts/minimaws/lib/dbaccess.py @@ -716,15 +716,15 @@ class QueryCursor(object): def get_softwarelist_software(self, id, pattern): if pattern is not None: return self.dbcurs.execute( - 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(*) AS parts ' \ - 'FROM software JOIN softwarepart ON software.id = softwarepart.software ' \ + 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(DISTINCT softwarepart.id) AS parts, COUNT(softwareromdump.rom) + COUNT(softwarediskdump.disk) AS baddumps ' \ + 'FROM software JOIN softwarepart ON software.id = softwarepart.software LEFT JOIN softwareromdump ON softwarepart.id = softwareromdump.part AND softwareromdump.bad = 1 LEFT JOIN softwarediskdump ON softwarepart.id = softwarediskdump.part AND softwarediskdump.bad = 1 ' \ 'WHERE software.softwarelist = ? AND software.shortname GLOB ? ' \ 'GROUP BY software.id', (id, pattern)) else: return self.dbcurs.execute( - 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(*) AS parts ' \ - 'FROM software JOIN softwarepart ON software.id = softwarepart.software ' \ + 'SELECT software.shortname AS shortname, software.description AS description, software.year AS year, software.publisher AS publisher, software.supported AS supported, COUNT(DISTINCT softwarepart.id) AS parts, COUNT(softwareromdump.rom) + COUNT(softwarediskdump.disk) AS baddumps ' \ + 'FROM software JOIN softwarepart ON software.id = softwarepart.software LEFT JOIN softwareromdump ON softwarepart.id = softwareromdump.part AND softwareromdump.bad = 1 LEFT JOIN softwarediskdump ON softwarepart.id = softwarediskdump.part AND softwarediskdump.bad = 1 ' \ 'WHERE software.softwarelist = ? ' \ 'GROUP BY software.id', (id, )) -- cgit v1.2.3-70-g09d2