Merge pull request #1054 from nexB/74-license-expressions

Add support for license expressions #74

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

etc/scripts/json2csv.py

@@ -146,10 +146,6 @@ def collect_keys(mapping, key_group):
                 elif k == 'matched_rule':
                     for mrk, mrv in val.items():
                         mrk = 'matched_rule__' + mrk
-                        if mrk == 'license_choice':
-                            mrv = 'y' if mrv else ''
-                        if mrk == 'licenses':
-                            mrv = ' '.join(mrv)
                         if mrk in ('match_coverage', 'rule_relevance'):
                             # normalize the string representation of this number
                             mrv = '{:.2f}'.format(mrv)