This should get us back on track (tested on ARCH Linux)
This commit is contained in:
@@ -164,7 +164,7 @@ class NanoController:
|
||||
profession = "Martial Artist"
|
||||
strain = strain[7:]
|
||||
nanoline = self.db.query_single(
|
||||
"SELECT * FROM nanos n WHERE n.strain LIKE ? AND profession =? and type='Crystal' LIMIT 1",
|
||||
"SELECT * FROM nanos n WHERE n.strain LIKE ? AND profession =? and type in ('Crystal', 'Misc') LIMIT 1",
|
||||
[strain, profession])
|
||||
|
||||
if not nanoline:
|
||||
@@ -174,7 +174,7 @@ class NanoController:
|
||||
"SELECT n.* FROM nanos n "
|
||||
"where n.strain LIKE ? "
|
||||
"and n.profession = ? "
|
||||
"and type='Crystal' "
|
||||
"and type in ('Crystal', 'Misc') "
|
||||
"group by nano_id "
|
||||
"ORDER BY n.strain, n.ql DESC, n.nano_name",
|
||||
["%" + strain.replace(" ", "%") + "%", profession])
|
||||
@@ -193,6 +193,10 @@ class NanoController:
|
||||
|
||||
return ChatBlob("%s %s Nanos" % (nanoline.profession, str(nanoline.strain).replace("_", " ")), blob)
|
||||
|
||||
# @command(command='disc', params=[Any("search")], access_level="member",
|
||||
# description="Search for the disc to a Crystal, or the other way around.")
|
||||
# def disc_search_command(self, req, search):
|
||||
# pass
|
||||
@command(command="nanolines", params=[Any("profession")], access_level="member",
|
||||
description="Show nanolines by profession")
|
||||
def nanolines_profession_cmd(self, _, prof_name):
|
||||
@@ -204,7 +208,7 @@ class NanoController:
|
||||
"SELECT CASE WHEN strain = 'Composite' THEN 'Composite' ELSE school END as school, strain, profession "
|
||||
"FROM nanos WHERE Profession = ? "
|
||||
"and location not like 'No%longer%drops' "
|
||||
"and type not in ('Tainted', 'Misc') "
|
||||
"and type not in ('Tainted') "
|
||||
"GROUP by strain ORDER BY school, strain='Composite', strain", [profession])
|
||||
|
||||
blob = ""
|
||||
|
||||
Reference in New Issue
Block a user