Skip to content

Commit

Permalink
Merged kfsone/tradedangerous into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@maddavo
maddavo committed Apr 15, 2015
2 parents fec9815 + 438f0cc commit 9f14c50
Show file tree
Hide file tree
Showing 7 changed files with 3,169 additions and 2,556 deletions.
9 changes: 9 additions & 0 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
==============================================================================

v6.18.1 Apr 13 2015
. (kfsone) import: forcibly set market flag to 'Y' in the database for
stations that have items listed,
. (kfsone) tradedb: override the database's "market" attribute with 'Y'
when loading stations if the item count > 0
. (kfsone) "maddavo" plugin: add Mad's corrections to our own for the
duration of the import so we don't immediately re-add bad data.
+ (kfsone) ~200 new systems

v6.18.0 Apr 11 2015
. (kfsone) #215 removed "AltItemName" table
. (kfsone) #216 fixed a crash when using "direct" cleanly
Expand Down
9 changes: 9 additions & 0 deletions cache.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,15 @@ def delta(self):
""", buys)
insertedBuys = buyCounter.delta

tdenv.DEBUG0("Marking populated stations as having a market")
db.execute(
"UPDATE Station SET market = 'Y'"
" WHERE EXISTS"
" (SELECT station_id FROM StationItem"
" WHERE StationItem.station_id = Station.station_id"
")"
)

db.commit()

changes = " and ".join("{} {}".format(v, k) for k, v in {
Expand Down
55 changes: 55 additions & 0 deletions data/ShipVendor.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,14 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'KAUSAN','Lyulka Ring','Type 9','2015-03-29 14:11:04'
'KAUSAN','Lyulka Ring','Viper','2015-03-29 14:11:31'
'KAUSAN','Lyulka Ring','Vulture','2015-03-29 14:11:18'
'KHAMPTI','Babcock Gateway','Asp','2015-04-13 00:12:00'
'KHAMPTI','Babcock Gateway','Eagle','2015-04-13 00:12:02'
'KHAMPTI','Babcock Gateway','Fer-de-Lance','2015-04-13 00:12:04'
'KHAMPTI','Babcock Gateway','Hauler','2015-04-13 00:12:06'
'KHAMPTI','Babcock Gateway','Sidewinder','2015-04-13 00:12:08'
'KHAMPTI','Babcock Gateway','Type 6','2015-04-13 00:12:10'
'KHAMPTI','Babcock Gateway','Type 7','2015-04-13 00:12:12'
'KHAMPTI','Babcock Gateway','Type 9','2015-04-13 00:12:14'
'KHAN GUBII','Alpers City','Adder','2015-03-04 19:50:35'
'KHAN GUBII','Alpers City','Anaconda','2015-03-04 19:50:35'
'KHAN GUBII','Alpers City','Asp','2015-03-04 19:50:35'
Expand Down Expand Up @@ -1351,6 +1359,13 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'LHS 277','Rowley Port','Type 7','2015-03-04 19:50:35'
'LHS 277','Rowley Port','Type 9','2015-03-04 19:50:35'
'LHS 277','Rowley Port','Viper','2015-03-04 19:50:35'
'LHS 283','Khan Port','Adder','2015-04-13 16:39:57'
'LHS 283','Khan Port','Cobra','2015-04-13 16:39:57'
'LHS 283','Khan Port','Eagle','2015-04-13 16:39:57'
'LHS 283','Khan Port','Hauler','2015-04-13 16:39:57'
'LHS 283','Khan Port','Sidewinder','2015-04-13 16:39:57'
'LHS 283','Khan Port','Type 6','2015-04-13 16:39:57'
'LHS 283','Khan Port','Viper','2015-04-13 16:39:57'
'LHS 2931','Lee Station','Adder','2015-03-28 17:08:19'
'LHS 2931','Lee Station','Anaconda','2015-03-28 17:07:45'
'LHS 2931','Lee Station','Asp','2015-03-28 17:07:32'
Expand Down Expand Up @@ -1557,6 +1572,9 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'LTT 9605','Laurent Terminal','Hauler','2015-04-06 05:50:11'
'LTT 9605','Laurent Terminal','Sidewinder','2015-04-06 05:49:53'
'LTT 9605','Laurent Terminal','Viper','2015-04-06 05:50:11'
'LTT 9663','Mies Van Der Rohe Terminal','Cobra','2015-04-12 14:36:01'
'LTT 9663','Mies Van Der Rohe Terminal','Type 6','2015-04-12 14:36:01'
'LTT 9663','Mies Van Der Rohe Terminal','Viper','2015-04-12 14:36:01'
'LTT 9863','Lynden-Bell Terminal','Asp','2015-03-29 20:58:38'
'LTT 9863','Lynden-Bell Terminal','Eagle','2015-03-29 20:58:38'
'LTT 9863','Lynden-Bell Terminal','Hauler','2015-03-29 20:58:10'
Expand Down Expand Up @@ -1601,6 +1619,12 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'MAKULU','Hubble City','Viper','2015-03-28 20:45:33'
'MALINA','Kooi Resort','Sidewinder','2015-03-24 08:39:24'
'MALINA','Kooi Resort','Type 6','2015-03-24 08:39:24'
'MANDJILA','Irens Hub','Adder','2015-04-12 04:06:18'
'MANDJILA','Irens Hub','Cobra','2015-04-12 04:06:20'
'MANDJILA','Irens Hub','Eagle','2015-04-12 04:06:22'
'MANDJILA','Irens Hub','Hauler','2015-04-12 04:06:24'
'MANDJILA','Irens Hub','Sidewinder','2015-04-12 04:06:26'
'MANDJILA','Irens Hub','Viper','2015-04-12 04:06:28'
'MAORSI','Karachkina City','Asp','2015-03-29 19:24:18'
'MAORSI','Karachkina City','Clipper','2015-03-29 19:24:18'
'MAORSI','Karachkina City','Cobra','2015-03-29 19:24:19'
Expand Down Expand Up @@ -1740,6 +1764,15 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'MUNDJIGA','Sagan Port','Type 9','2015-03-22 11:40:26'
'MUNDJIGA','Sagan Port','Viper','2015-03-22 11:39:39'
'MUNDJIGA','Sagan Port','Vulture','2015-03-22 11:40:45'
'MUTUJIALI','Siegel Orbital','Adder','2015-04-12 03:53:08'
'MUTUJIALI','Siegel Orbital','Cobra','2015-04-12 03:53:09'
'MUTUJIALI','Siegel Orbital','Eagle','2015-04-12 03:53:11'
'MUTUJIALI','Siegel Orbital','Hauler','2015-04-12 03:53:13'
'MUTUJIALI','Siegel Orbital','Python','2015-04-12 03:53:15'
'MUTUJIALI','Siegel Orbital','Sidewinder','2015-04-12 03:53:17'
'MUTUJIALI','Siegel Orbital','Type 6','2015-04-12 03:53:19'
'MUTUJIALI','Siegel Orbital','Type 9','2015-04-12 03:53:21'
'MUTUJIALI','Siegel Orbital','Viper','2015-04-12 03:53:23'
'NADUNINDA','Robson Mines','Asp','2015-03-04 19:50:35'
'NADUNINDA','Robson Mines','Eagle','2015-03-04 19:50:35'
'NADUNINDA','Robson Mines','Hauler','2015-03-04 19:50:35'
Expand Down Expand Up @@ -1999,6 +2032,28 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'SESUANG','Drummond Enterprise','Sidewinder','2015-03-17 08:31:01'
'SESUANG','Drummond Enterprise','Type 7','2015-03-17 08:31:01'
'SESUANG','Drummond Enterprise','Vulture','2015-03-17 08:31:01'
'SHERONES','Al-Din Al-Urdi Orbital','Adder','2015-04-12 17:09:18'
'SHERONES','Al-Din Al-Urdi Orbital','Clipper','2015-04-12 17:09:18'
'SHERONES','Al-Din Al-Urdi Orbital','Cobra','2015-04-12 17:09:18'
'SHERONES','Al-Din Al-Urdi Orbital','Hauler','2015-04-12 17:09:18'
'SHERONES','Al-Din Al-Urdi Orbital','Sidewinder','2015-04-12 17:09:18'
'SHERONES','Al-Din Al-Urdi Orbital','Type 6','2015-04-12 17:09:19'
'SHERONES','Al-Din Al-Urdi Orbital','Type 9','2015-04-12 17:09:19'
'SHERONES','Al-Din Al-Urdi Orbital','Viper','2015-04-12 17:09:18'
'SHERONES','Gustav Sporer Station','Cobra','2015-04-12 17:30:32'
'SHERONES','Gustav Sporer Station','Eagle','2015-04-12 17:30:32'
'SHERONES','Gustav Sporer Station','Hauler','2015-04-12 17:30:32'
'SHERONES','Gustav Sporer Station','Sidewinder','2015-04-12 17:30:32'
'SHERONES','Gustav Sporer Station','Type 6','2015-04-12 17:30:32'
'SHERONES','Gustav Sporer Station','Viper','2015-04-12 17:30:31'
'SHERONES','Whitford Port','Adder','2015-04-12 16:50:44'
'SHERONES','Whitford Port','Asp','2015-04-12 16:50:44'
'SHERONES','Whitford Port','Eagle','2015-04-12 16:50:44'
'SHERONES','Whitford Port','Hauler','2015-04-12 16:50:45'
'SHERONES','Whitford Port','Sidewinder','2015-04-12 16:50:45'
'SHERONES','Whitford Port','Type 7','2015-04-12 16:50:45'
'SHERONES','Whitford Port','Viper','2015-04-12 16:50:44'
'SHERONES','Whitford Port','Vulture','2015-04-12 16:50:44'
'SHINRARTA DEZHRA','Jameson Memorial','Adder','2015-03-13 04:02:05'
'SHINRARTA DEZHRA','Jameson Memorial','Anaconda','2015-03-13 04:02:05'
'SHINRARTA DEZHRA','Jameson Memorial','Asp','2015-03-13 04:02:05'
Expand Down
Loading

0 comments on commit 9f14c50

Please sign in to comment.