From ab6e68492c579a8e61e0496e9a6b3abe4e46dcf5 Mon Sep 17 00:00:00 2001
From: Sven Gato Redsun <svengato@svengato.com>
Date: Tue, 15 Oct 2019 14:25:40 -0600
Subject: [PATCH 1/4] Fix class name in SortOrderList.__repr__

---
 intermine/pathfeatures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intermine/pathfeatures.py b/intermine/pathfeatures.py
index a128a39f..c07a168f 100644
--- a/intermine/pathfeatures.py
+++ b/intermine/pathfeatures.py
@@ -103,7 +103,7 @@ def append(self, *sos):
                         "Sort orders must be either SortOrder instances,"
                         + " or tuples of arguments: I got:" + so + sos)
     def __repr__(self):
-        return '<' + self.class__.__name__ + ': [' + str(self) + ']>'
+        return '<' + self.__class__.__name__ + ': [' + str(self) + ']>'
     def __str__(self):
         return " ".join(map(str, self.sort_orders))
     def clear(self):

From 652e7d225508e296ff3316416c31479249af3111 Mon Sep 17 00:00:00 2001
From: Sven Gato Redsun <svengato@svengato.com>
Date: Tue, 15 Oct 2019 14:31:55 -0600
Subject: [PATCH 2/4] Add template title and correct (long) description

---
 intermine/query.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/intermine/query.py b/intermine/query.py
index 4bce1288..c5bf16e7 100644
--- a/intermine/query.py
+++ b/intermine/query.py
@@ -337,6 +337,7 @@ def __init__(self, model, service=None, validate=True, root=None):
             self.root = model.make_path(root).root
 
         self.name = ''
+        self.title = ''
         self.description = ''
         self.service = service
         self.prefetch_depth = service.prefetch_depth if service is not None  else 1
@@ -423,13 +424,20 @@ def from_xml(cls, xml, *args, **kwargs):
         doc = minidom.parse(f)
         f.close()
 
+        templates = doc.getElementsByTagName('template')
+        if len(templates) != 1:
+            raise QueryParseError("wrong number of templates in xml. "
+                + "Only one <template> element is allowed. Found %d" % len(templates))
+        t = templates[0]
+        obj.title = t.getAttribute('title')
+
         queries = doc.getElementsByTagName('query')
         if len(queries) != 1:
             raise QueryParseError("wrong number of queries in xml. "
                 + "Only one <query> element is allowed. Found %d" % len(queries))
         q = queries[0]
         obj.name = q.getAttribute('name')
-        obj.description = q.getAttribute('description')
+        obj.description = q.getAttribute('longDescription')
         obj.add_view(q.getAttribute('view'))
         for p in q.getElementsByTagName('pathDescription'):
             path = p.getAttribute('pathString')

From da2bb31358db1662b8efdca43a957f1697e14f3b Mon Sep 17 00:00:00 2001
From: Sven Gato Redsun <svengato@svengato.com>
Date: Tue, 15 Oct 2019 15:50:36 -0600
Subject: [PATCH 3/4] Fix line to conform to PEP 8 guidelines

---
 intermine/query.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/intermine/query.py b/intermine/query.py
index c5bf16e7..96272e96 100644
--- a/intermine/query.py
+++ b/intermine/query.py
@@ -426,8 +426,10 @@ def from_xml(cls, xml, *args, **kwargs):
 
         templates = doc.getElementsByTagName('template')
         if len(templates) != 1:
-            raise QueryParseError("wrong number of templates in xml. "
-                + "Only one <template> element is allowed. Found %d" % len(templates))
+            raise QueryParseError(
+                "wrong number of templates in xml. "
+                + "Only one <template> element is allowed. "
+                + "Found %d" % len(templates))
         t = templates[0]
         obj.title = t.getAttribute('title')
 

From 9a9768c39f8b5a776f7b376df0d52d22b6ee12b9 Mon Sep 17 00:00:00 2001
From: Sven Gato Redsun <svengato@svengato.com>
Date: Tue, 22 Oct 2019 11:39:22 -0600
Subject: [PATCH 4/4] Move template title, and the code for parsing it from
 XML, from Query to Template

---
 intermine/query.py | 51 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/intermine/query.py b/intermine/query.py
index 96272e96..279a83f7 100644
--- a/intermine/query.py
+++ b/intermine/query.py
@@ -337,7 +337,6 @@ def __init__(self, model, service=None, validate=True, root=None):
             self.root = model.make_path(root).root
 
         self.name = ''
-        self.title = ''
         self.description = ''
         self.service = service
         self.prefetch_depth = service.prefetch_depth if service is not None  else 1
@@ -424,15 +423,6 @@ def from_xml(cls, xml, *args, **kwargs):
         doc = minidom.parse(f)
         f.close()
 
-        templates = doc.getElementsByTagName('template')
-        if len(templates) != 1:
-            raise QueryParseError(
-                "wrong number of templates in xml. "
-                + "Only one <template> element is allowed. "
-                + "Found %d" % len(templates))
-        t = templates[0]
-        obj.title = t.getAttribute('title')
-
         queries = doc.getElementsByTagName('query')
         if len(queries) != 1:
             raise QueryParseError("wrong number of queries in xml. "
@@ -1713,6 +1703,47 @@ def __init__(self, *args, **kwargs):
         """
         super(Template, self).__init__(*args, **kwargs)
         self.constraint_factory = constraints.TemplateConstraintFactory()
+        self.title = ''
+
+    @classmethod
+    def from_xml(cls, xml, *args, **kwargs):
+        """
+        Deserialise a template query serialised to XML
+        ==============================================
+
+        This method is used to instantiate serialised templates.
+        It is used by intermine.webservice.Service objects
+        to instantiate Template objects and it can be used
+        to read in templates you have saved to a file.
+
+        @param xml: The xml as a file name, url, or string
+
+        @raise QueryParseError: if the query cannot be parsed
+
+        @rtype: L{Template}
+        """
+        # Extract all Query (superclass) fields
+        obj = super(Template, cls).from_xml(xml, *args, **kwargs)
+
+        # Extract fields specific to Template, like title
+        obj.do_verification = False
+        f = openAnything(xml)
+        doc = minidom.parse(f)
+        f.close()
+
+        templates = doc.getElementsByTagName('template')
+        if len(templates) != 1:
+            raise QueryParseError(
+                "wrong number of templates in xml. "
+                + "Only one <template> element is allowed. "
+                + "Found %d" % len(templates))
+        t = templates[0]
+        obj.title = t.getAttribute('title')
+
+        obj.verify()
+
+        return obj
+
     @property
     def editable_constraints(self):
         """