From c2e905b1205ab39a63151f04562535006da89e19 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 3 Nov 2012 20:47:27 +0100
Subject: [PATCH] Templates: Create default dir (to be used by all templates as
 fallback)

---
 Templates/{EK_Full => default}/webshop_descriptions.def | 2 ++
 generate_oly_score.py                                   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename Templates/{EK_Full => default}/webshop_descriptions.def (94%)

diff --git a/Templates/EK_Full/webshop_descriptions.def b/Templates/default/webshop_descriptions.def
similarity index 94%
rename from Templates/EK_Full/webshop_descriptions.def
rename to Templates/default/webshop_descriptions.def
index 7f70121..47bb8a3 100644
--- a/Templates/EK_Full/webshop_descriptions.def
+++ b/Templates/default/webshop_descriptions.def
@@ -14,4 +14,6 @@
     "<< e.sku >>": {"ismn": "<<e.ismn>>", "comment": "<<e.comment>>", "price": <<e.price|default(0.00)>>}, # << e.type >>
 <$- endfor $>
   },
+  "Productimages": [
+  ],
 }
diff --git a/generate_oly_score.py b/generate_oly_score.py
index 3b1110b..047fb41 100755
--- a/generate_oly_score.py
+++ b/generate_oly_score.py
@@ -186,9 +186,10 @@ class Settings:
     global program_name;
     global script_path;
     templatename = self.get_template_name ();
+    self.defaulttemplatepath = script_path + '/Templates/default';
     self.templatepath = script_path + '/Templates/' + templatename;
     self.template_env = Environment (
-          loader = FileSystemLoader(self.templatepath),
+          loader = FileSystemLoader([self.templatepath,self.defaulttemplatepath]),
           block_start_string = '<$', block_end_string = '$>',
           variable_start_string = '<<', variable_end_string = '>>',
           comment_start_string = '<#', comment_end_string = '#>',
@@ -369,7 +370,7 @@ def write_settings_file_if_exists (settings, score_settings, template, filename)
     filename = settings.assemble_settings_filename (basename, filename);
     write_file (settings.out_dir, filename, template.render (score_settings));
     return filename;
-  except jinja2.exceptions.TemplateNotFound:
+  except jinja2.exceptions.TemplateNotFound as e:
     return None;
 
 def generate_settings_files (score_name, score_settings, settings, settings_files):
-- 
2.11.4.GIT