change xml:id s to labels

Author: bnmnetp

runestone/activecode/activecode.py

@@ -61,7 +61,7 @@ def setup(app):
 
 
 XML_EX_START = """
-<exercise xml:id="{divid}">
+<exercise label="{divid}">
     <statement>
 """
 

runestone/clickableArea/clickable.py

@@ -47,7 +47,7 @@ def setup(app):
 """
 
 XML_START = """
-<exercise xml:id="{divid}">
+<exercise label="{divid}">
     <statement><p>{question}</p></statement>
 """
 

runestone/dragndrop/dragndrop.py

@@ -53,7 +53,7 @@ def setup(app):
 TEMPLATE_END = """</ul></div>"""
 
 XML_START = """
-<exercise xml:id="{divid}">
+<exercise label="{divid}">
     <statement><p>{question}</p></statement>
     {feedback}
 """

runestone/mchoice/multiplechoice.py

@@ -36,7 +36,7 @@ class MChoiceNode(nodes.General, nodes.Element, RunestoneIdNode):
 
 
 XML_START = """
-    <exercise xml:id="{divid}">
+    <exercise label="{divid}">
         <statement>
 
 """

runestone/parsons/parsons.py

@@ -85,7 +85,7 @@ def visit_parsons_xml(self, node):
     else:
         node["runestone_options"]["language"] = "language='python'"
 
-    res = "<exercise xml:id='{divid}' {numbered} {adaptive} {noindent} {language}>".format(
+    res = "<exercise label='{divid}' {numbered} {adaptive} {noindent} {language}>".format(
         **node["runestone_options"])
     res += "<statement>\n"
     self.output.append(res)

runestone/pretext/chapter_pop.py

@@ -10,7 +10,7 @@
 from sphinx.util import logging
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
+#logger.setLevel(logging.INFO)
 
 QT_MAP = {
     "multiplechoice": "mchoice",
@@ -85,8 +85,14 @@ def manifest_data_to_db(course_name, manifest_path):
         for subchapter in chapter.findall("./subchapter"):
             subchap += 1
             logger.debug(subchapter.find("./id").text, subchapter.find("./title").text)
+            titletext = subchapter.find("./title").text
+            if not titletext:
+                titletext = " ".join(
+                    [ET.tostring(y).decode("utf8")
+                     for y in subchapter.findall("./title/*")]
+                )
             ins = subchapters.insert().values(
-                sub_chapter_name=subchapter.find("./title").text,
+                sub_chapter_name=titletext,
                 chapter_id=chapid,
                 sub_chapter_label=subchapter.find("./id").text,
                 skipreading="F",

runestone/shortanswer/shortanswer.py

@@ -49,7 +49,7 @@ def setup(app):
 """
 
 XML_START = """
-<exercise xml:id="{divid}"  {optional}>
+<exercise label="{divid}"  {optional}>
     <statement>
 """