Merge pull request #170 from philipmat/label_parent_id

brings in parentLabel.id

Author: philipmat

discogsxml2db/exporter.py

@@ -140,7 +140,7 @@ class LabelExporter(EntityCsvExporter):
     def __init__(self, *args, **kwargs):
         super().__init__('label', *args, **kwargs)
 
-        main_fields = ['id', 'name', 'contactinfo', 'profile', 'parentLabel', 'data_quality']
+        main_fields = ['id', 'name', 'contactinfo', 'profile', 'parentLabel', 'parentLabelId', 'data_quality']
         image_fields = ['type', 'width', 'height']
         self.actions = (
             ('label', _write_entity, [main_fields]),
@@ -255,7 +255,7 @@ def write_track_artists(self, writer, release):
 
 
 csv_headers = {table: columns.split() for table, columns in {
-    'label': 'id name contact_info profile parent_name data_quality',
+    'label': 'id name contact_info profile parent_name parent_id data_quality',
     'label_url': 'label_id url',
     'label_image': 'label_id type width height',
 

discogsxml2db/parser.py

@@ -156,15 +156,18 @@ def build_entity(self, entity_id, element):
             if t in ('data_quality',
                      'contactinfo',
                      'name',
-                     'profile',
-                     'parentLabel'):
+                     'profile'):
+                setattr(label, t, gettext_stripped(e))
+
+            elif t in ('parentLabel',):
                 setattr(label, t, gettext_stripped(e))
+                setattr(label, "parentLabelId", e.attrib.get("id"))
 
             elif t in ('sublabels',
                        'urls'):
                 setattr(label, t, list(self.children_text(e)))
 
-            elif t in ('images'):
+            elif t in ('images',):
                 setattr(label, t, list(self.element_attributes(e, ImageInfo)))
         return label
 

postgresql/dbconfig.py

@@ -55,7 +55,7 @@ def connect_db(cfg, set_search_path=False):
 
 
 columns = {table: columns.split() for table, columns in {
-    'label':                'id name contact_info profile parent_name data_quality',
+    'label':                'id name contact_info profile parent_name parent_id data_quality',
     'label_url':            'label_id url',
     'label_image':          'label_id type width height',