Updated recipe imports

Author: jayaddison

dbs/autochef/functions/feeds/fn_importrecipes.sql

@@ -5,6 +5,18 @@ create or replace function fn_importrecipes
 returns setof record as
 '
 begin
+    create temporary table ingredients
+    (
+        ingredientid varchar(12),
+        duration interval
+    );
+
+    insert into ingredients (ingredientid, duration)
+    select
+        (xpath(''/ingredient/@ingredientid'', t.xml))[1],
+        coalesce(nullif((xpath(''/ingredient/@duration'', t.xml))[1]::text, ''''), ''0'')::interval
+    from unnest(xpath(''/xml/ingredients/ingredient'', input)) as t;
+
     create temporary table translations
     (
         ingredientid varchar(12),
@@ -35,8 +47,9 @@ begin
 
     return query
         select *
-        from translations as t
-        join dependencies as d on d.childid = t.ingredientid;
+        from ingredients as i
+        join dependencies as d on d.childid = i.ingredientid
+        join translations as t on t.ingredientid = i.ingredientid;
 end;
 '
 language plpgsql;

idx/rdl/example.rdl

@@ -1,7 +1,7 @@
 <recipes>
 
   <!-- Spaghetti Bolognese -->
-  <recipe>
+  <recipe duration="10 minutes">
 
     <locale languageid="en">
        <name>spaghetti bolognese</name>

idx/rdl/example.sh

@@ -1 +1 @@
-psql autochef -c "select * from fn_importrecipes('`xsltproc flatten.xslt example.rdl`') as (ingredientid varchar(12), languageid char(2), name text, instructions text, parentid varchar(12), childid varchar(12))"
+psql autochef -c "select * from fn_importrecipes('`xsltproc flatten.xslt example.rdl`') as (ingredientid varchar(12), duration interval, parentid varchar(12), childid varchar(12), translationingredientid varchar(12), languageid char(2), name text, instructions text)"

idx/rdl/flatten.xslt

@@ -5,11 +5,21 @@
 
   <xsl:template match="recipes">
     <xml>
+      <ingredients><xsl:call-template name="ingredients" /></ingredients>
       <translations><xsl:call-template name="translations" /></translations>
       <dependencies><xsl:call-template name="dependencies" /></dependencies>
     </xml>
   </xsl:template>
 
+  <xsl:template name="ingredients">
+    <xsl:for-each select="//recipe|//ingredient|//product">
+      <xsl:element name="ingredient">
+        <xsl:attribute name="ingredientid"><xsl:value-of select="generate-id()" /></xsl:attribute>
+        <xsl:attribute name="duration"><xsl:value-of select="@duration" /></xsl:attribute>
+      </xsl:element>
+    </xsl:for-each>
+  </xsl:template>
+
   <xsl:template name="translations">
     <xsl:for-each select="//locale">
       <xsl:element name="translation">
@@ -29,8 +39,8 @@
     </xsl:for-each>
     <xsl:for-each select="//ingredient|//product">
       <xsl:element name="dependency">
-        <xsl:attribute name="ingredientid"><xsl:value-of select="generate-id()" /></xsl:attribute>
         <xsl:attribute name="parentid"><xsl:value-of select="generate-id(../..)" /></xsl:attribute>
+        <xsl:attribute name="ingredientid"><xsl:value-of select="generate-id()" /></xsl:attribute>
       </xsl:element>
     </xsl:for-each>
   </xsl:template>