From 6e040a3aa057586b059d1552d0afdd48d9d20944 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 5 Apr 2009 23:42:38 +0200
Subject: [PATCH] MusicXML: Don't crash when a part is missing the id attribute

Still missing: If there is only one part (which has the id missing),
we could automatically assign the id...
(cherry picked from commit e3ee8d211f06835f76fe9d5cd4fba50a1be47cc1)
---
 input/regression/musicxml/41g-PartNoId.xml    | 26 ++++++++++
 .../regression/musicxml/41h-TooManyParts.xml  | 47 +++++++++++++++++++
 scripts/musicxml2ly.py                        | 12 ++++-
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 input/regression/musicxml/41g-PartNoId.xml
 create mode 100644 input/regression/musicxml/41h-TooManyParts.xml

diff --git a/input/regression/musicxml/41g-PartNoId.xml b/input/regression/musicxml/41g-PartNoId.xml
new file mode 100644
index 0000000000..337b851607
--- /dev/null
+++ b/input/regression/musicxml/41g-PartNoId.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">A part with no id attribute.
+            Since this piece has only one part, it is clear which part 
+            is described by the one part element.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <part>
+    <measure number="1">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/41h-TooManyParts.xml b/input/regression/musicxml/41h-TooManyParts.xml
new file mode 100644
index 0000000000..64b7dc90ba
--- /dev/null
+++ b/input/regression/musicxml/41h-TooManyParts.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">This piece has more part elements
+              than the part-list section gives. One can either convert all
+              the parts present, but not listed in the part-list, or simply 
+              not import / ignore them.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <part id="P1">
+    <measure number="1">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+  </part>
+  <part id="P3">
+    <measure number="1">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+  </part>
+  <part id="P4">
+    <measure number="1">
+      <note>
+        <rest/>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+    </measure>
+  </part>
+</score-partwise>
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 8abf58a3f6..b0f8091582 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -2547,7 +2547,17 @@ def voices_in_part (part):
 
 def voices_in_part_in_parts (parts):
     """return a Part -> Name -> Voice dictionary"""
-    return dict([(p.id, voices_in_part (p)) for p in parts])
+    # don't crash if p doesn't have an id (that's invalid MusicXML,
+    # but such files are out in the wild!
+    dictionary = {}
+    for p in parts:
+        voices = voices_in_part (p)
+        if (hasattr (p, "id")):
+             dictionary[p.id] = voices
+        else:
+             # TODO: extract correct part id from other sources
+             dictionary[None] = voices
+    return dictionary;
 
 
 def get_all_voices (parts):
-- 
2.39.2