summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-09-07 00:43:52 +1000
committer Vas Crabb <vas@vastheman.com>2021-09-07 00:43:52 +1000
commit88f6393be8ab3a4a399eda6319e8550cd584a5d0 (patch)
tree0c5e414bac5fd75cf21bb58ffdffe8837667173e
parentfa9c035c8024e0f78fde882fb3e8437485ec91ae (diff)
minimaws: Better equality for devices.
-rw-r--r--scripts/minimaws/lib/dbaccess.py12
-rw-r--r--scripts/minimaws/lib/wsgiserve.py2
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/minimaws/lib/dbaccess.py b/scripts/minimaws/lib/dbaccess.py
index 7ca5ebf243d..c22b7c318fa 100644
--- a/scripts/minimaws/lib/dbaccess.py
+++ b/scripts/minimaws/lib/dbaccess.py
@@ -587,13 +587,13 @@ class QueryCursor(object):
if pattern is not None:
return self.dbcurs.execute(
'SELECT shortname, description ' \
- 'FROM machine WHERE isdevice = 0 AND shortname GLOB ? ' \
+ 'FROM machine WHERE shortname GLOB ? ' \
'ORDER BY shortname ASC',
(pattern, ))
else:
return self.dbcurs.execute(
'SELECT shortname, description ' \
- 'FROM machine WHERE isdevice = 0 ' \
+ 'FROM machine ' \
'ORDER BY shortname ASC')
def listsource(self, pattern):
@@ -601,14 +601,14 @@ class QueryCursor(object):
return self.dbcurs.execute(
'SELECT machine.shortname, sourcefile.filename ' \
'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id ' \
- 'WHERE machine.isdevice = 0 AND machine.shortname GLOB ? ' \
+ 'WHERE machine.shortname GLOB ? ' \
'ORDER BY machine.shortname ASC',
(pattern, ))
else:
return self.dbcurs.execute(
'SELECT machine.shortname, sourcefile.filename ' \
'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id ' \
- 'WHERE machine.isdevice = 0 ORDER BY machine.shortname ASC')
+ 'ORDER BY machine.shortname ASC')
def listclones(self, pattern):
if pattern is not None:
@@ -668,7 +668,7 @@ class QueryCursor(object):
def get_machine_details(self, machine):
return self.dbcurs.execute(
'SELECT machine.id AS id, machine.description AS description, machine.isdevice AS isdevice, machine.runnable AS runnable, sourcefile.filename AS sourcefile, system.year AS year, system.manufacturer AS manufacturer, cloneof.parent AS cloneof, romof.parent AS romof ' \
- 'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id LEFT JOIN system ON machine.id = system.id LEFT JOIN cloneof ON system.id = cloneof.id LEFT JOIN romof ON system.id = romof.id ' \
+ 'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id LEFT JOIN system ON machine.id = system.id LEFT JOIN cloneof ON machine.id = cloneof.id LEFT JOIN romof ON machine.id = romof.id ' \
'WHERE machine.shortname = ?',
(machine, ))
@@ -707,7 +707,7 @@ class QueryCursor(object):
def get_sourcefile_machines(self, id):
return self.dbcurs.execute(
'SELECT machine.shortname AS shortname, machine.description AS description, machine.isdevice AS isdevice, machine.runnable AS runnable, sourcefile.filename AS sourcefile, system.year AS year, system.manufacturer AS manufacturer, cloneof.parent AS cloneof, romof.parent AS romof ' \
- 'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id LEFT JOIN system ON machine.id = system.id LEFT JOIN cloneof ON system.id = cloneof.id LEFT JOIN romof ON system.id = romof.id ' \
+ 'FROM machine JOIN sourcefile ON machine.sourcefile = sourcefile.id LEFT JOIN system ON machine.id = system.id LEFT JOIN cloneof ON machine.id = cloneof.id LEFT JOIN romof ON machine.id = romof.id ' \
'WHERE machine.sourcefile = ?',
(id, ))
diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py
index f1ddc5df220..0a5cda4f762 100644
--- a/scripts/minimaws/lib/wsgiserve.py
+++ b/scripts/minimaws/lib/wsgiserve.py
@@ -275,7 +275,7 @@ class MachineHandler(QueryPageHandler):
(self.machine_href(machine_info['romof']), htmlescape(parent[1]), htmlescape(machine_info['romof']))).encode('utf-8')
else:
yield (
- ' <tr><th>Parent machine:</th><td><a href="%s">%s</a></td></tr>\n' %
+ ' <tr><th>Parent ROM set:</th><td><a href="%s">%s</a></td></tr>\n' %
(self.machine_href(machine_info['romof']), htmlescape(machine_info['romof']))).encode('utf-8')
unemulated = []
imperfect = []