Skip to content

Commit

Permalink
6.18.0 Fixes #215 Removing AltItemName table
Browse files Browse the repository at this point in the history
  • Loading branch information
@kfsone
kfsone committed Apr 11, 2015
1 parent 74ff12a commit 9263e72
Show file tree
Hide file tree
Showing 8 changed files with 334 additions and 213 deletions.
4 changes: 3 additions & 1 deletion CHANGES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
==============================================================================

Apr 09 2015: ~200 new systems
v6.18.0 Apr 11 2015
. (kfsone) #215 removed "AltItemName" table
+ Apr 09 2015: ~200 new systems

v6.17.5 Apr 08 2015
. (kfsone) Fixed problem with 'import' not updating dates
Expand Down
1 change: 0 additions & 1 deletion README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,6 @@ EXPORT sub-command:
> trade.py export --path misc
Using database './data/TradeDangerous.db'
Export Table 'Added' to 'misc/Added.csv'
Export Table 'AltItemNames' to 'misc/AltItemNames.csv'
Export Table 'Category' to 'misc/Category.csv'
Export Table 'Item' to 'misc/Item.csv'
Export Table 'Ship' to 'misc/Ship.csv'
Expand Down
3 changes: 1 addition & 2 deletions TradeDangerous.pyproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<ItemGroup>
<Content Include="CHANGES.txt" />
<Content Include="data\Added.csv" />
<Content Include="data\AltItemNames.csv" />
<Content Include="data\Category.csv" />
<Content Include="data\Item.csv" />
<Content Include="data\Ship.csv" />
Expand All @@ -83,4 +82,4 @@
</ItemGroup>
<Import Project="$(PtvsTargetsFile)" Condition="Exists($(PtvsTargetsFile))" />
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="!Exists($(PtvsTargetsFile))" />
</Project>
</Project>
12 changes: 6 additions & 6 deletions csvexport.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
# Default values

# for some tables the first two columns will be reversed
reverseList = [ 'AltItemNames',
'Item',
'ShipVendor',
'Station',
'StationBuying',
'UpgradeVendor',
reverseList = [
'Item',
'ShipVendor',
'Station',
'StationBuying',
'UpgradeVendor',
]

######################################################################
Expand Down
50 changes: 50 additions & 0 deletions data/ShipVendor.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,modified
'16 LYRAE','Hannu Ring','Adder','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Cobra','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Hauler','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Python','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Sidewinder','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Type 6','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Type 9','2015-04-10 16:15:41'
'16 LYRAE','Hannu Ring','Viper','2015-04-10 16:15:41'
'35 DRACONIS','Conway Dock','Adder','2015-03-22 10:57:10'
'35 DRACONIS','Conway Dock','Anaconda','2015-03-22 10:56:32'
'35 DRACONIS','Conway Dock','Asp','2015-03-22 10:57:31'
Expand Down Expand Up @@ -474,6 +482,18 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'CERNO','Kanwar Enterprise','Type 7','2015-03-04 19:50:35'
'CERNO','Kanwar Enterprise','Type 9','2015-03-04 19:50:35'
'CERNO','Kanwar Enterprise','Viper','2015-03-04 19:50:35'
'CH''I LIN','Fallows Orbital','Adder','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Clipper','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Cobra','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Eagle','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Hauler','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Python','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Sidewinder','2015-04-10 18:20:52'
'CH''I LIN','Fallows Orbital','Type 6','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Type 7','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Type 9','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Viper','2015-04-10 18:22:30'
'CH''I LIN','Fallows Orbital','Vulture','2015-04-10 18:22:30'
'CHOWEI','Swigert Port','Adder','2015-03-20 15:44:39'
'CHOWEI','Swigert Port','Asp','2015-03-20 15:44:39'
'CHOWEI','Swigert Port','Cobra','2015-03-20 15:45:58'
Expand Down Expand Up @@ -1732,6 +1752,16 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'NLTT 41463','Manning City','Type 6','2015-03-11 18:52:17'
'NLTT 41463','Manning City','Type 7','2015-03-11 18:51:49'
'NLTT 41463','Manning City','Type 9','2015-03-11 18:52:17'
'NLTT 56379','Xin Hub','Anaconda','2015-04-07 21:23:53'
'NLTT 56379','Xin Hub','Asp','2015-04-07 21:23:53'
'NLTT 56379','Xin Hub','Clipper','2015-04-07 21:23:53'
'NLTT 56379','Xin Hub','Cobra','2015-04-07 21:23:53'
'NLTT 56379','Xin Hub','Hauler','2015-04-07 21:23:53'
'NLTT 56379','Xin Hub','Python','2015-04-07 21:23:54'
'NLTT 56379','Xin Hub','Sidewinder','2015-04-07 21:23:54'
'NLTT 56379','Xin Hub','Type 6','2015-04-07 21:23:54'
'NLTT 56379','Xin Hub','Type 7','2015-04-07 21:23:54'
'NLTT 56379','Xin Hub','Viper','2015-04-07 21:22:46'
'NUNGAMICI','Thiele Port','Asp','2015-03-03 01:00:00'
'NUNGAMICI','Thiele Port','Eagle','2015-03-03 01:00:00'
'NUNGAMICI','Thiele Port','Hauler','2015-03-03 01:00:00'
Expand Down Expand Up @@ -1906,6 +1936,14 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'ROSS 209','Janes Terminal','Type 7','2015-04-06 01:02:00'
'ROSS 209','Janes Terminal','Viper','2015-04-06 01:02:00'
'ROSS 209','Janes Terminal','Vulture','2015-04-06 01:02:00'
'SALANGIRAWI','Abetti Station','Adder','2015-04-07 20:48:47'
'SALANGIRAWI','Abetti Station','Asp','2015-04-07 20:49:00'
'SALANGIRAWI','Abetti Station','Cobra','2015-04-07 20:48:48'
'SALANGIRAWI','Abetti Station','Hauler','2015-04-07 20:48:48'
'SALANGIRAWI','Abetti Station','Sidewinder','2015-04-07 20:47:58'
'SALANGIRAWI','Abetti Station','Type 6','2015-04-07 20:48:48'
'SALANGIRAWI','Abetti Station','Type 7','2015-04-07 20:48:48'
'SALANGIRAWI','Abetti Station','Type 9','2015-04-07 20:48:49'
'SALARHUL','Hiraga Gateway','Hauler','2015-03-22 18:44:21'
'SALARHUL','Hiraga Gateway','Sidewinder','2015-03-22 18:44:09'
'SALARHUL','Hiraga Gateway','Type 6','2015-03-22 18:44:27'
Expand Down Expand Up @@ -2088,6 +2126,18 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id,mod
'USZAA','Guest Installation','Type 6','2015-03-28 06:49:07'
'USZAA','Guest Installation','Type 7','2015-03-28 06:49:33'
'USZAA','Guest Installation','Viper','2015-03-28 06:49:33'
'VAKA','Zenbei Orbital','Anaconda','2015-04-10 17:12:07'
'VAKA','Zenbei Orbital','Asp','2015-04-10 17:12:34'
'VAKA','Zenbei Orbital','Clipper','2015-04-10 17:13:05'
'VAKA','Zenbei Orbital','Cobra','2015-04-10 17:12:50'
'VAKA','Zenbei Orbital','Hauler','2015-04-10 17:12:50'
'VAKA','Zenbei Orbital','Orca','2015-04-10 17:12:34'
'VAKA','Zenbei Orbital','Python','2015-04-10 17:12:07'
'VAKA','Zenbei Orbital','Sidewinder','2015-04-10 17:11:45'
'VAKA','Zenbei Orbital','Type 6','2015-04-10 17:12:50'
'VAKA','Zenbei Orbital','Type 9','2015-04-10 17:13:05'
'VAKA','Zenbei Orbital','Viper','2015-04-10 17:12:07'
'VAKA','Zenbei Orbital','Vulture','2015-04-10 17:12:34'
'VELIM','Bunnell Port','Adder','2015-04-11 06:41:35'
'VELIM','Bunnell Port','Anaconda','2015-04-11 06:41:30'
'VELIM','Bunnell Port','Asp','2015-04-11 06:41:24'
Expand Down
Loading

0 comments on commit 9263e72

Please sign in to comment.