From e438ba216ad1247dca02b54ef61acc5841695afb Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Wed, 13 Sep 2017 15:40:41 +0100
Subject: [PATCH] No longer collate average commodity prices

---
 EDMC.py    | 2 +-
 collate.py | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/EDMC.py b/EDMC.py
index c2026cd1..87b72bca 100755
--- a/EDMC.py
+++ b/EDMC.py
@@ -165,7 +165,7 @@ try:
     else:
         print data['lastSystem']['name']
 
-    if (args.m or args.o or args.s or args.n):
+    if (args.m or args.o or args.s or args.n or args.j):
         if not data['commander'].get('docked'):
             sys.stderr.write("You're not docked at a station!\n")
             sys.exit(EXIT_SUCCESS)
diff --git a/collate.py b/collate.py
index 883976de..e0a0c1f0 100755
--- a/collate.py
+++ b/collate.py
@@ -36,14 +36,11 @@ def addcommodities(data):
         new = {
             'id'       : commodity['id'],
             'category' : commodity['categoryname'],
-            'average'  : commodity['cost_mean'].split('.')[0]
         }
         old = commodities.get(key)
         if old:
             if new['id'] != old['id'] or new['category'] != old['category']:
                 raise AssertionError('%s: "%s"!="%s"' % (key, new, old))
-            elif new['average'] != old['average']:
-                size_pre -= 1
         commodities[key] = new
 
     if len(commodities) > size_pre:
@@ -54,7 +51,7 @@ def addcommodities(data):
             os.rename(commodityfile, commodityfile+'.bak')
 
         with open(commodityfile, 'wb') as csvfile:
-            writer = csv.DictWriter(csvfile, ['id','category', 'name', 'average'])
+            writer = csv.DictWriter(csvfile, ['id','category', 'name'])
             writer.writeheader()
             for key in commodities:
                 commodities[key]['name'] = key