From 0caa7135810cb3d4c64f261d2e6fc6c11bcb5769 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Sat, 23 Sep 2017 13:27:43 +0100
Subject: [PATCH] Only send economies and prohibited lists if present in the
 cAPI data

---
 eddn.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/eddn.py b/eddn.py
index dde075ba..9d8e24a4 100644
--- a/eddn.py
+++ b/eddn.py
@@ -178,17 +178,20 @@ class EDDN:
 
         # Don't send empty commodities list - schema won't allow it
         if commodities:
+            message = OrderedDict([
+                ('timestamp',   time.strftime('%Y-%m-%dT%H:%M:%SZ',
+                                              time.gmtime(config.getint('querytime') or int(time.time())))),
+                ('systemName',  data['lastSystem']['name']),
+                ('stationName', data['lastStarport']['name']),
+                ('commodities', commodities),
+            ])
+            if 'economies' in data['lastStarport']:
+                message['economies']  = sorted([x for x in data['lastStarport'].get('economies',  {}).itervalues()])
+            if 'prohibited' in data['lastStarport']:
+                message['prohibited'] = sorted([x for x in data['lastStarport'].get('prohibited', {}).itervalues()])
             self.send(data['commander']['name'], {
                 '$schemaRef' : 'https://eddn.edcd.io/schemas/commodity/3' + (is_beta and '/test' or ''),
-                'message'    : OrderedDict([
-                    ('timestamp',   time.strftime('%Y-%m-%dT%H:%M:%SZ',
-                                                  time.gmtime(config.getint('querytime') or int(time.time())))),
-                    ('systemName',  data['lastSystem']['name']),
-                    ('stationName', data['lastStarport']['name']),
-                    ('commodities', commodities),
-                    ('economies',   sorted([x for x in data['lastStarport'].get('economies',  {}).itervalues()])),
-                    ('prohibited',  sorted([x for x in data['lastStarport'].get('prohibited', {}).itervalues()])),
-                ]),
+                'message'    : message,
             })
 
     def export_outfitting(self, data, is_beta):