# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2010-01-23 16:20:33
# Node ID 86c54813cdc2d9184c0e5be8b953198a7daeb8d9
# Parent  6e74651480a0612f1748724111ab17ee0d9eb4c7

fix distrenjob_serialize()

diff --git a/src/server/distrenjob.c b/src/server/distrenjob.c
--- a/src/server/distrenjob.c
+++ b/src/server/distrenjob.c
@@ -59,7 +59,7 @@ int distrenjob_new(struct distrenjob **d
   dj->name = (char *)NULL;
   dj->submitter = (char *)NULL;
 
-  df->output_format = (char *)NULL;
+  dj->output_format = (char *)NULL;
   dj->width = 0;
   dj->height = 0;
 
@@ -231,13 +231,13 @@ int distrenjob_unserialize(struct distre
   xmlXPathFreeContext(xmlxpathcontext);
   xmlFreeDoc(xmldoc);
 
-#ifndef NDEBUG
-  fprintf(stderr, "distrenjob_unserialize(): restoring %d frames\n", dj->total_frames);
-#endif
   /**
      reconstruct the frameset
   */
   dj->total_frames = end_frame - start_frame + 1;
+#ifndef NDEBUG
+  fprintf(stderr, "distrenjob_unserialize(): restoring %d frames\n", dj->total_frames);
+#endif
   dj->frameset = malloc(sizeof(struct frameset) * dj->total_frames);
   if(!dj->frameset)
     {
@@ -309,8 +309,8 @@ int distrenjob_serialize(struct distrenj
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"start_frame", (xmlChar*)tmp);
   free(tmp);
 
-  _distren_asprintf(&tmp, "%d", job->frameset[(job->total_frames - 1)].num);
-  xmlTextWriterWriteAttribute(writer, (xmlChar*)"end_fame", (xmlChar*)tmp);
+  _distren_asprintf(&tmp, "%d", job->frameset[ job->total_frames - 1 ].num);
+  xmlTextWriterWriteAttribute(writer, (xmlChar*)"end_frame", (xmlChar*)tmp);
   free(tmp);
 
   xmlTextWriterWriteAttribute(writer, (xmlChar*)"output_format", (xmlChar*)job->output_format);
@@ -318,10 +318,16 @@ int distrenjob_serialize(struct distrenj
 
   /**
      write watchdog forgiveness element */
+  xmlTextWriterStartElement(writer, (xmlChar*)"watchdog");
+
   _distren_asprintf(&tmp, "%d", job->watchdog_forgiveness);
-  xmlTextWriterWriteElement(writer, (xmlChar*)"wd_forgiveness", (xmlChar*)tmp);
+  xmlTextWriterWriteAttribute(writer, (xmlChar *)"forgiveness", (xmlChar *)tmp);
   free(tmp);
 
+  xmlTextWriterEndElement(writer); /* </watchdog> */
+
+  xmlTextWriterEndElement(writer); /* </job> */
+
   /**
      end document */
   xmlTextWriterEndDocument(writer);