diff options
author | 2019-12-16 01:46:47 +1100 | |
---|---|---|
committer | 2019-12-16 01:46:47 +1100 | |
commit | f43e9dbaa28ca8241b9b27d5dbbb5a6afd96553e (patch) | |
tree | e7e56370bdc98bf3cdf737ad7ed745361fa740e1 /scripts/minimaws/lib/dbaccess.py | |
parent | b99eb3774e657f4967f4676eba9e9593cbe81ff6 (diff) |
minimaws: add software list support to web-based romident
(nw) also removed unused member that was breaking clang builds
Diffstat (limited to 'scripts/minimaws/lib/dbaccess.py')
-rw-r--r-- | scripts/minimaws/lib/dbaccess.py | 8 |
1 files changed, 4 insertions, 4 deletions
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, )) |