amend c61335c277, unbreak datasource templates, and add a test to ensure it does not regress again

src/load_map.cpp

@@ -340,9 +340,9 @@ void map_parser::parse_map_include(Map & map, xml_node const& include)
                 {
                     if (paramIter->is("Parameter"))
                     {
-                        name = paramIter->get_attr<std::string>("name");
+                        std::string param_name = paramIter->get_attr<std::string>("name");
                         std::string value = paramIter->get_text();
-                        params[name] = value;
+                        params[param_name] = value;
                     }
                 }
                 datasource_templates_[name] = params;

tests/python_tests/datasource_xml_template_test.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+from nose.tools import *
+from utilities import execution_path
+import mapnik
+
+def setup():
+    # All of the paths used are relative, if we run the tests
+    # from another directory we need to chdir()
+    os.chdir(execution_path('.'))
+
+def test_datasource_template_is_working():
+    m = mapnik.Map(256,256)
+    try:
+        mapnik.load_map(m,'../data/good_maps/datasource.xml')
+    except RuntimeError, e:
+        if "Required parameter 'type'" in str(e):
+            raise RuntimeError(e)
+
+if __name__ == "__main__":
+    setup()
+    [eval(run)() for run in dir() if 'test_' in run]