X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fodt.c;h=c0a386e653d502cc9207616534ac8bd76885f18e;hb=ef28191d9249de6ba14312b4faabcb11d382cdb1;hp=0b55ac9ae9222efb7b60aede6e4a1c4fdc0351c4;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp diff --git a/src/output/odt.c b/src/output/odt.c index 0b55ac9ae9..c0a386e653 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,9 @@ #include #include #include +#ifdef HAVE_PWD_H #include +#endif #include #include #include @@ -29,8 +31,11 @@ #include "libpspp/assertion.h" #include "libpspp/cast.h" +#include "libpspp/message.h" #include "libpspp/str.h" +#include "libpspp/temp-file.h" #include "libpspp/version.h" +#include "libpspp/zip-writer.h" #include "output/driver-provider.h" #include "output/message-item.h" #include "output/options.h" @@ -40,28 +45,26 @@ #include "output/text-item.h" #include "gl/xalloc.h" -#include "gl/error.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#define _xml(X) (const xmlChar *)(X) +#define _xml(X) (CHAR_CAST (const xmlChar *, X)) struct odt_driver { struct output_driver driver; + struct zip_writer *zip; /* ZIP file writer. */ char *file_name; /* Output file name. */ - bool debug; - /* The name of the temporary directory used to construct the ODF */ - char *dirname; + /* content.xml */ + xmlTextWriterPtr content_wtr; /* XML writer. */ + FILE *content_file; /* Temporary file. */ - /* Writer for the content.xml file */ - xmlTextWriterPtr content_wtr; - - /* Writer fot the manifest.xml file */ - xmlTextWriterPtr manifest_wtr; + /* manifest.xml */ + xmlTextWriterPtr manifest_wtr; /* XML writer. */ + FILE *manifest_file; /* Temporary file. */ /* Number of tables so far. */ int table_num; @@ -81,52 +84,34 @@ odt_driver_cast (struct output_driver *driver) /* Create the "mimetype" file needed by ODF */ static bool -create_mimetype (const char *dirname) +create_mimetype (struct zip_writer *zip) { FILE *fp; - struct string filename; - ds_init_cstr (&filename, dirname); - ds_put_cstr (&filename, "/mimetype"); - fp = fopen (ds_cstr (&filename), "w"); + fp = create_temp_file (); if (fp == NULL) { - error (0, errno, _("failed to create output file %s"), - ds_cstr (&filename)); - ds_destroy (&filename); + msg_error (errno, _("error creating temporary file")); return false; } - ds_destroy (&filename); fprintf (fp, "application/vnd.oasis.opendocument.text"); - fclose (fp); + zip_writer_add (zip, fp, "mimetype"); + close_temp_file (fp); return true; } -/* Create a new XML file called FILENAME in the temp directory, and return a writer for it */ -static xmlTextWriterPtr -create_writer (const struct odt_driver *driver, const char *filename) +/* Creates a new temporary file and stores it in *FILE, then creates an XML + writer for it and stores it in *W. */ +static void +create_writer (FILE **file, xmlTextWriterPtr *w) { - char *copy = NULL; - xmlTextWriterPtr w; - struct string str; - ds_init_cstr (&str, driver->dirname); - ds_put_cstr (&str, "/"); - ds_put_cstr (&str, filename); - - /* dirname modifies its argument, so we must copy it */ - copy = xstrdup (ds_cstr (&str)); - mkdir (dirname (copy), 0700); - free (copy); - - w = xmlNewTextWriterFilename (ds_cstr (&str), 0); - - ds_destroy (&str); + /* XXX this can fail */ + *file = create_temp_file (); + *w = xmlNewTextWriter (xmlOutputBufferCreateFile (*file, NULL)); - xmlTextWriterStartDocument (w, NULL, "UTF-8", NULL); - - return w; + xmlTextWriterStartDocument (*w, NULL, "UTF-8", NULL); } @@ -143,7 +128,10 @@ register_file (struct odt_driver *odt, const char *filename) static void write_style_data (struct odt_driver *odt) { - xmlTextWriterPtr w = create_writer (odt, "styles.xml"); + xmlTextWriterPtr w; + FILE *file; + + create_writer (&file, &w); register_file (odt, "styles.xml"); xmlTextWriterStartElement (w, _xml ("office:document-styles")); @@ -230,12 +218,17 @@ write_style_data (struct odt_driver *odt) xmlTextWriterEndDocument (w); xmlFreeTextWriter (w); + zip_writer_add (odt->zip, file, "styles.xml"); + close_temp_file (file); } static void write_meta_data (struct odt_driver *odt) { - xmlTextWriterPtr w = create_writer (odt, "meta.xml"); + xmlTextWriterPtr w; + FILE *file; + + create_writer (&file, &w); register_file (odt, "meta.xml"); xmlTextWriterStartElement (w, _xml ("office:document-meta")); @@ -255,74 +248,71 @@ write_meta_data (struct odt_driver *odt) { char buf[30]; - struct passwd *pw = getpwuid (getuid ()); time_t t = time (NULL); struct tm *tm = localtime (&t); strftime (buf, 30, "%Y-%m-%dT%H:%M:%S", tm); - xmlTextWriterStartElement (w, _xml ("meta:initial-creator")); - xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); - xmlTextWriterEndElement (w); - xmlTextWriterStartElement (w, _xml ("meta:creation-date")); xmlTextWriterWriteString (w, _xml (buf)); xmlTextWriterEndElement (w); - xmlTextWriterStartElement (w, _xml ("dc:creator")); - xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); - - xmlTextWriterEndElement (w); - xmlTextWriterStartElement (w, _xml ("dc:date")); xmlTextWriterWriteString (w, _xml (buf)); xmlTextWriterEndElement (w); } +#ifdef HAVE_PWD_H + { + struct passwd *pw = getpwuid (getuid ()); + if (pw != NULL) + { + xmlTextWriterStartElement (w, _xml ("meta:initial-creator")); + xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); + xmlTextWriterEndElement (w); + + xmlTextWriterStartElement (w, _xml ("dc:creator")); + xmlTextWriterWriteString (w, _xml (strtok (pw->pw_gecos, ","))); + xmlTextWriterEndElement (w); + } + } +#endif + xmlTextWriterEndElement (w); xmlTextWriterEndElement (w); xmlTextWriterEndDocument (w); xmlFreeTextWriter (w); -} - -enum -{ - output_file_arg, - boolean_arg, -}; - -static struct driver_option * -opt (struct output_driver *d, struct string_map *options, const char *key, - const char *default_value) -{ - return driver_option_get (d, options, key, default_value); + zip_writer_add (odt->zip, file, "meta.xml"); + close_temp_file (file); } static struct output_driver * odt_create (const char *file_name, enum settings_output_devices device_type, - struct string_map *o) + struct string_map *o UNUSED) { struct output_driver *d; struct odt_driver *odt; + struct zip_writer *zip; + + zip = zip_writer_create (file_name); + if (zip == NULL) + return NULL; odt = xzalloc (sizeof *odt); d = &odt->driver; output_driver_init (d, &odt_driver_class, file_name, device_type); + odt->zip = zip; odt->file_name = xstrdup (file_name); - odt->debug = parse_boolean (opt (d, o, "debug", "false")); - odt->dirname = xstrdup ("odt-XXXXXX"); - mkdtemp (odt->dirname); - - if (!create_mimetype (odt->dirname)) + if (!create_mimetype (zip)) { output_driver_destroy (d); return NULL; } /* Create the manifest */ - odt->manifest_wtr = create_writer (odt, "META-INF/manifest.xml"); + create_writer (&odt->manifest_file, &odt->manifest_wtr); xmlTextWriterStartElement (odt->manifest_wtr, _xml("manifest:manifest")); xmlTextWriterWriteAttribute (odt->manifest_wtr, _xml("xmlns:manifest"), @@ -339,7 +329,7 @@ odt_create (const char *file_name, enum settings_output_devices device_type, write_meta_data (odt); write_style_data (odt); - odt->content_wtr = create_writer (odt, "content.xml"); + create_writer (&odt->content_file, &odt->content_wtr); register_file (odt, "content.xml"); @@ -365,6 +355,8 @@ odt_create (const char *file_name, enum settings_output_devices device_type, xmlTextWriterEndElement (odt->manifest_wtr); xmlTextWriterEndDocument (odt->manifest_wtr); xmlFreeTextWriter (odt->manifest_wtr); + zip_writer_add (odt->zip, odt->manifest_file, "META-INF/manifest.xml"); + close_temp_file (odt->manifest_file); return d; } @@ -376,40 +368,46 @@ odt_destroy (struct output_driver *driver) 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_writer_add (odt->zip, odt->content_file, "content.xml"); + close_temp_file (odt->content_file); - /* 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); + zip_writer_close (odt->zip); } + + free (odt->file_name); + free (odt->command_name); + free (odt); +} - if ( !odt->debug ) - { - /* Remove the temp dir */ - struct string rm_cmd; +static void +write_xml_with_line_breaks (xmlTextWriterPtr writer, char *line) +{ + char *newline; + char *p; - ds_init_empty (&rm_cmd); - ds_put_format (&rm_cmd, "rm -r %s", odt->dirname); - system (ds_cstr (&rm_cmd)); - ds_destroy (&rm_cmd); + for (p = line; *p; p = newline + 1) + { + newline = strchr (p, '\n'); + + if (!newline) + { + xmlTextWriterWriteString (writer, _xml(p)); + return; + } + + if (newline > p && newline[-1] == '\r') + newline[-1] = '\0'; + else + *newline = '\0'; + xmlTextWriterWriteString (writer, _xml(p)); + xmlTextWriterWriteElement (writer, _xml("text:line-break"), _xml("")); } - else - fprintf (stderr, "Not removing directory %s\n", odt->dirname); - - free (odt->command_name); - free (odt->dirname); - free (odt); } static void @@ -485,7 +483,14 @@ odt_submit_table (struct odt_driver *odt, struct table_item *item) else xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); - xmlTextWriterWriteString (odt->content_wtr, _xml(cell.contents)); + if (strchr (cell.contents, '\n')) + { + char *line = xstrdup (cell.contents); + write_xml_with_line_breaks (odt->content_wtr, line); + free (line); + } + else + xmlTextWriterWriteString (odt->content_wtr, _xml(cell.contents)); xmlTextWriterEndElement (odt->content_wtr); /* text:p */ xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */ @@ -529,8 +534,10 @@ odt_submit (struct output_driver *driver, odt_submit_table (odt, to_table_item (output_item)); else if (is_text_item (output_item)) { - /* XXX apply different styles based on text_item's type. */ - odt_output_text (odt, text_item_get_text (to_text_item (output_item))); + struct text_item *text_item = to_text_item (output_item); + + if (text_item_get_type (text_item) != TEXT_ITEM_COMMAND_CLOSE) + odt_output_text (odt, text_item_get_text (text_item)); } else if (is_message_item (output_item)) { @@ -542,7 +549,8 @@ odt_submit (struct output_driver *driver, } } -struct output_driver_factory odt_driver_factory = { "odt", odt_create }; +struct output_driver_factory odt_driver_factory = + { "odt", "pspp.odf", odt_create }; static const struct output_driver_class odt_driver_class = {