Greatly simplify PSPP configuration.

[pspp] / src / output / odt.c

diff --git a/src/output/odt.c b/src/output/odt.c
index 8883875297498cd45e0a870bf1ef46c5003f7126..ab38cd0411c91d779a860f86c7380896d6e425de 100644 (file)
--- a/src/output/odt.c
+++ b/src/output/odt.c
@@ -18,17 +18,7 @@
 
 /* A driver for creating OpenDocument Format text files from PSPP's output */
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-#include <output/driver-provider.h>
-#include <output/options.h>
-#include <output/tab.h>
-#include <output/table-item.h>
-#include <output/table-provider.h>
-#include <output/text-item.h>
-
+#include <errno.h>
 #include <libgen.h>
 #include <libxml/xmlwriter.h>
 #include <pwd.h>
@@ -37,8 +27,19 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "xalloc.h"
-#include "error.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+#include "output/driver-provider.h"
+#include "output/options.h"
+#include "output/tab.h"
+#include "output/table-item.h"
+#include "output/table-provider.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
+#include "gl/error.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -65,15 +66,17 @@ struct odt_driver
   int table_num;
 };
 
+static const struct output_driver_class odt_driver_class;
+
 static struct odt_driver *
 odt_driver_cast (struct output_driver *driver)
 {
-  assert (driver->class == &odt_class);
+  assert (driver->class == &odt_driver_class);
   return UP_CAST (driver, struct odt_driver, driver);
 }
 
 /* Create the "mimetype" file needed by ODF */
-static void
+static bool
 create_mimetype (const char *dirname)
 {
   FILE *fp;
@@ -81,11 +84,20 @@ create_mimetype (const char *dirname)
   ds_init_cstr (&filename, dirname);
   ds_put_cstr (&filename, "/mimetype");
   fp = fopen (ds_cstr (&filename), "w");
+
+  if (fp == NULL)
+    {
+      error (0, errno, _("failed to create output file %s"),
+             ds_cstr (&filename));
+      ds_destroy (&filename);
+      return false;
+    }
   ds_destroy (&filename);
 
-  assert (fp);
   fprintf (fp, "application/vnd.oasis.opendocument.text");
   fclose (fp);
+
+  return true;
 }
 
 /* Create a new XML file called FILENAME in the temp directory, and return a writer for it */
@@ -283,7 +295,7 @@ opt (struct output_driver *d, struct string_map *options, const char *key,
 }
 
 static struct output_driver *
-odt_create (const char *name, enum output_device_type device_type,
+odt_create (const char *file_name, enum settings_output_devices device_type,
             struct string_map *o)
 {
   struct output_driver *d;
@@ -291,15 +303,19 @@ odt_create (const char *name, enum output_device_type device_type,
 
   odt = xzalloc (sizeof *odt);
   d = &odt->driver;
-  output_driver_init (d, &odt_class, name, device_type);
+  output_driver_init (d, &odt_driver_class, file_name, device_type);
 
-  odt->file_name = parse_string (opt (d, o, "output-file", "pspp.odt"));
+  odt->file_name = xstrdup (file_name);
   odt->debug = parse_boolean (opt (d, o, "debug", "false"));
 
   odt->dirname = xstrdup ("odt-XXXXXX");
   mkdtemp (odt->dirname);
 
-  create_mimetype (odt->dirname);
+  if (!create_mimetype (odt->dirname))
+    {
+      output_driver_destroy (d);
+      return NULL;
+    }
 
   /* Create the manifest */
   odt->manifest_wtr = create_writer (odt, "META-INF/manifest.xml");
@@ -354,28 +370,31 @@ odt_destroy (struct output_driver *driver)
 {
   struct odt_driver *odt = odt_driver_cast (driver);
 
-  struct string zip_cmd;
-  struct string rm_cmd;
-
-  xmlTextWriterEndElement (odt->content_wtr); /* office:text */
-  xmlTextWriterEndElement (odt->content_wtr); /* office:body */
-  xmlTextWriterEndElement (odt->content_wtr); /* office:document-content */
-
-  xmlTextWriterEndDocument (odt->content_wtr);
-  xmlFreeTextWriter (odt->content_wtr);
-
-  /* Zip up the directory */
-  ds_init_empty (&zip_cmd);
-  ds_put_format (&zip_cmd,
-                "cd %s ; rm -f ../%s; zip -q -X ../%s mimetype; zip -q -X -u -r ../%s .",
-                odt->dirname, odt->file_name, odt->file_name, odt->file_name);
-  system (ds_cstr (&zip_cmd));
-  ds_destroy (&zip_cmd);
-
+  if (odt->content_wtr != NULL)
+    {
+      struct string zip_cmd;
+
+      xmlTextWriterEndElement (odt->content_wtr); /* office:text */
+      xmlTextWriterEndElement (odt->content_wtr); /* office:body */
+      xmlTextWriterEndElement (odt->content_wtr); /* office:document-content */
+
+      xmlTextWriterEndDocument (odt->content_wtr);
+      xmlFreeTextWriter (odt->content_wtr);
+
+      /* Zip up the directory */
+      ds_init_empty (&zip_cmd);
+      ds_put_format (&zip_cmd,
+                     "cd %s ; rm -f ../%s; zip -q -X ../%s mimetype; zip -q -X -u -r ../%s .",
+                     odt->dirname, odt->file_name, odt->file_name, odt->file_name);
+      system (ds_cstr (&zip_cmd));
+      ds_destroy (&zip_cmd);
+    }
 
   if ( !odt->debug )
     {
       /* Remove the temp dir */
+      struct string rm_cmd;
+
       ds_init_empty (&rm_cmd);
       ds_put_format (&rm_cmd, "rm -r %s", odt->dirname);
       system (ds_cstr (&rm_cmd));
@@ -504,11 +523,11 @@ odt_submit (struct output_driver *driver,
     }
 }
 
-/* ODT driver class. */
-const struct output_driver_class odt_class =
+struct output_driver_factory odt_driver_factory = { "odt", odt_create };
+
+static const struct output_driver_class odt_driver_class =
 {
   "odf",
-  odt_create,
   odt_destroy,
   odt_submit,
   NULL,