X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fodt.c;h=8471b6b3fb7eb46bb16a536b748161eac7337902;hb=refs%2Ftags%2Fsid-i386-build114;hp=6511aa3f10022bf23e675b32564c9fe1a4fec32b;hpb=f01552a8e61627dda53097f2b6698abdd97e9f08;p=pspp-builds.git diff --git a/src/output/odt.c b/src/output/odt.c index 6511aa3f..8471b6b3 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -16,16 +16,20 @@ #include +#include "gettext.h" +#define _(msgid) gettext (msgid) + +/* A driver for creating OpenDocument Format text files from PSPP's output */ #include -#include #include -#include -#include + #include #include #include +#include +#include #include #include @@ -33,15 +37,22 @@ #include -#include +#include "xalloc.h" #include "error.h" -#include "intprops.h" -#include "minmax.h" -#include "xalloc.h" #define _xml(X) (const xmlChar *)(X) + +struct odf_driver_options +{ + struct outp_driver *driver; + + char *file_name; /* Output file name. */ + bool debug; +}; + + struct odt_driver_ext { /* The name of the temporary directory used to construct the ODF */ @@ -52,6 +63,8 @@ struct odt_driver_ext /* Writer fot the manifest.xml file */ xmlTextWriterPtr manifest_wtr; + + struct odf_driver_options opts; }; @@ -67,10 +80,12 @@ create_mimetype (const char *dirname) fp = fopen (ds_cstr (&filename), "w"); ds_destroy (&filename); + assert (fp); fprintf (fp, "application/vnd.oasis.opendocument.text"); fclose (fp); } +/* 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_ext *driver, const char *filename) { @@ -95,6 +110,218 @@ create_writer (const struct odt_driver_ext *driver, const char *filename) return w; } + +static void +register_file (struct odt_driver_ext *x, const char *filename) +{ + assert (x->manifest_wtr); + xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:file-entry")); + xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:media-type"), _xml("text/xml")); + xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:full-path"), _xml (filename)); + xmlTextWriterEndElement (x->manifest_wtr); +} + +static void +write_style_data (struct odt_driver_ext *x) +{ + xmlTextWriterPtr w = create_writer (x, "styles.xml"); + register_file (x, "styles.xml"); + + xmlTextWriterStartElement (w, _xml ("office:document-styles")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:office"), + _xml ("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); + + xmlTextWriterWriteAttribute (w, _xml ("xmlns:style"), + _xml ("urn:oasis:names:tc:opendocument:xmlns:style:1.0")); + + xmlTextWriterWriteAttribute (w, _xml ("xmlns:fo"), + _xml ("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0") ); + + xmlTextWriterWriteAttribute (w, _xml ("office:version"), _xml ("1.1")); + + + + xmlTextWriterStartElement (w, _xml ("office:styles")); + + + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), + _xml ("Standard")); + + xmlTextWriterWriteAttribute (w, _xml ("style:family"), + _xml ("paragraph")); + + xmlTextWriterWriteAttribute (w, _xml ("style:class"), + _xml ("text")); + + xmlTextWriterEndElement (w); /* style:style */ + } + + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), + _xml ("Table_20_Contents")); + + xmlTextWriterWriteAttribute (w, _xml ("style:display-name"), + _xml ("Table Contents")); + + xmlTextWriterWriteAttribute (w, _xml ("style:family"), + _xml ("paragraph")); + + xmlTextWriterWriteAttribute (w, _xml ("style:parent-style-name"), + _xml ("Standard")); + + xmlTextWriterWriteAttribute (w, _xml ("style:class"), + _xml ("extra")); + + xmlTextWriterEndElement (w); /* style:style */ + } + + { + xmlTextWriterStartElement (w, _xml ("style:style")); + xmlTextWriterWriteAttribute (w, _xml ("style:name"), + _xml ("Table_20_Heading")); + + xmlTextWriterWriteAttribute (w, _xml ("style:display-name"), + _xml ("Table Heading")); + + xmlTextWriterWriteAttribute (w, _xml ("style:family"), + _xml ("paragraph")); + + xmlTextWriterWriteAttribute (w, _xml ("style:parent-style-name"), + _xml ("Table_20_Contents")); + + xmlTextWriterWriteAttribute (w, _xml ("style:class"), + _xml ("extra")); + + + xmlTextWriterStartElement (w, _xml ("style:text-properties")); + xmlTextWriterWriteAttribute (w, _xml ("fo:font-weight"), _xml ("bold")); + xmlTextWriterWriteAttribute (w, _xml ("style:font-weight-asian"), _xml ("bold")); + xmlTextWriterWriteAttribute (w, _xml ("style:font-weight-complex"), _xml ("bold")); + xmlTextWriterEndElement (w); /* style:text-properties */ + + xmlTextWriterEndElement (w); /* style:style */ + } + + + xmlTextWriterEndElement (w); /* office:styles */ + xmlTextWriterEndElement (w); /* office:document-styles */ + + xmlTextWriterEndDocument (w); + xmlFreeTextWriter (w); +} + +static void +write_meta_data (struct odt_driver_ext *x) +{ + xmlTextWriterPtr w = create_writer (x, "meta.xml"); + register_file (x, "meta.xml"); + + xmlTextWriterStartElement (w, _xml ("office:document-meta")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:office"), _xml ("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:dc"), _xml ("http://purl.org/dc/elements/1.1/")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:meta"), _xml ("urn:oasis:names:tc:opendocument:xmlns:meta:1.0")); + xmlTextWriterWriteAttribute (w, _xml ("xmlns:ooo"), _xml("http://openoffice.org/2004/office")); + xmlTextWriterWriteAttribute (w, _xml ("office:version"), _xml("1.1")); + + xmlTextWriterStartElement (w, _xml ("office:meta")); + { + xmlTextWriterStartElement (w, _xml ("meta:generator")); + xmlTextWriterWriteString (w, _xml (stat_version)); + xmlTextWriterEndElement (w); + } + + + { + 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); + } + + xmlTextWriterEndElement (w); + xmlTextWriterEndElement (w); + xmlTextWriterEndDocument (w); + xmlFreeTextWriter (w); +} + +enum +{ + output_file_arg, + boolean_arg, +}; + +static const struct outp_option option_tab[] = +{ + {"output-file", output_file_arg,0}, + + {"debug", boolean_arg, 1}, + + {NULL, 0, 0}, +}; + +static bool +handle_option (void *options_, const char *key, const struct string *val) +{ + struct odf_driver_options *options = options_; + struct outp_driver *this = options->driver; + int subcat; + char *value = ds_cstr (val); + + switch (outp_match_keyword (key, option_tab, &subcat)) + { + case -1: + error (0, 0, + _("unknown configuration parameter `%s' for %s device " + "driver"), key, this->class->name); + break; + case output_file_arg: + free (options->file_name); + options->file_name = xstrdup (value); + break; + case boolean_arg: + if (!strcmp (value, "on") || !strcmp (value, "true") + || !strcmp (value, "yes") || atoi (value)) + options->debug = true; + else if (!strcmp (value, "off") || !strcmp (value, "false") + || !strcmp (value, "no") || !strcmp (value, "0")) + options->debug = false; + else + { + error (0, 0, _("boolean value expected for %s"), key); + return false; + } + break; + + default: + NOT_REACHED (); + } + + return true; +} + + static bool odt_open_driver (const char *name, int types, struct substring option_string) { @@ -103,15 +330,20 @@ odt_open_driver (const char *name, int types, struct substring option_string) this->ext = x = xmalloc (sizeof *x); + x->opts.driver = this; + x->opts.file_name = xstrdup ("pspp.pdt"); + x->opts.debug = false; + + outp_parse_options (this->name, option_string, handle_option, &x->opts); + outp_register_driver (this); x->dirname = xstrdup ("odt-XXXXXX"); mkdtemp (x->dirname); - printf ("Dir name is \"%s\"\n", x->dirname); - create_mimetype (x->dirname); + /* Create the manifest */ x->manifest_wtr = create_writer (x, "META-INF/manifest.xml"); xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:manifest")); @@ -119,20 +351,21 @@ odt_open_driver (const char *name, int types, struct substring option_string) _xml("urn:oasis:names:tc:opendocument:xmlns:manifest:1.0")); + /* Add a manifest entry for the document as a whole */ xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:file-entry")); xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:media-type"), _xml("application/vnd.oasis.opendocument.text")); xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:full-path"), _xml("/")); xmlTextWriterEndElement (x->manifest_wtr); - x->content_wtr = create_writer (x, "content.xml"); + write_meta_data (x); + write_style_data (x); - xmlTextWriterStartElement (x->manifest_wtr, _xml("manifest:file-entry")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:media-type"), _xml("text/xml")); - xmlTextWriterWriteAttribute (x->manifest_wtr, _xml("manifest:full-path"), _xml("content.xml")); - xmlTextWriterEndElement (x->manifest_wtr); + x->content_wtr = create_writer (x, "content.xml"); + register_file (x, "content.xml"); + /* Some necessary junk at the start */ xmlTextWriterStartElement (x->content_wtr, _xml("office:document-content")); xmlTextWriterWriteAttribute (x->content_wtr, _xml("xmlns:office"), _xml("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); @@ -149,6 +382,8 @@ odt_open_driver (const char *name, int types, struct substring option_string) xmlTextWriterStartElement (x->content_wtr, _xml("office:text")); + + /* Close the manifest */ xmlTextWriterEndElement (x->manifest_wtr); xmlTextWriterEndDocument (x->manifest_wtr); xmlFreeTextWriter (x->manifest_wtr); @@ -159,36 +394,61 @@ odt_open_driver (const char *name, int types, struct substring option_string) static bool odt_close_driver (struct outp_driver *this) { - struct odt_driver_ext *x = this->ext; + struct string zip_cmd; + struct string rm_cmd; + struct odt_driver_ext *x = this->ext; + + xmlTextWriterEndElement (x->content_wtr); /* office:text */ + xmlTextWriterEndElement (x->content_wtr); /* office:body */ + xmlTextWriterEndElement (x->content_wtr); /* office:document-content */ + + xmlTextWriterEndDocument (x->content_wtr); + xmlFreeTextWriter (x->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 ../pspp.odt .", + x->dirname, x->opts.file_name, x->opts.file_name); + system (ds_cstr (&zip_cmd)); + ds_destroy (&zip_cmd); - xmlTextWriterEndElement (x->content_wtr); /* office:text */ - xmlTextWriterEndElement (x->content_wtr); /* office:body */ - xmlTextWriterEndElement (x->content_wtr); /* office:document-content */ - xmlTextWriterEndDocument (x->content_wtr); - xmlFreeTextWriter (x->content_wtr); + if ( !x->opts.debug ) + { + /* Remove the temp dir */ + ds_init_empty (&rm_cmd); + ds_put_format (&rm_cmd, "rm -r %s", x->dirname); + system (ds_cstr (&rm_cmd)); + ds_destroy (&rm_cmd); + } + else + fprintf (stderr, "Not removing directory %s\n", x->dirname); + + free (x->dirname); + free (x); - return true; + return true; } static void -odt_open_page (struct outp_driver *this) +odt_open_page (struct outp_driver *this UNUSED) { - printf ("%s\n", __FUNCTION__); } static void -odt_close_page (struct outp_driver *this) +odt_close_page (struct outp_driver *this UNUSED) { - printf ("%s\n", __FUNCTION__); } static void -odt_output_chart (struct outp_driver *this, const struct chart *chart) +odt_output_chart (struct outp_driver *this UNUSED, const struct chart *chart UNUSED) { printf ("%s\n", __FUNCTION__); } + +/* Submit a table to the ODT driver */ static void odt_submit (struct outp_driver *this, struct som_entity *e) { @@ -197,11 +457,14 @@ odt_submit (struct outp_driver *this, struct som_entity *e) struct odt_driver_ext *x = this->ext; struct tab_table *tab = e->ext; + + /* Write a heading for the table */ xmlTextWriterStartElement (x->content_wtr, _xml("text:h")); xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("text:level"), "%d", e->subtable_num == 1 ? 2 : 3); xmlTextWriterWriteString (x->content_wtr, _xml (tab->title) ); xmlTextWriterEndElement (x->content_wtr); + /* Start table */ xmlTextWriterStartElement (x->content_wtr, _xml("table:table")); xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("table:name"), "TABLE-%d.%d", e->table_num, e->subtable_num); @@ -209,46 +472,89 @@ odt_submit (struct outp_driver *this, struct som_entity *e) /* Start column definitions */ xmlTextWriterStartElement (x->content_wtr, _xml("table:table-column")); - xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("table:number-columns-repeated"), "%d", tab->nc); + xmlTextWriterWriteFormatAttribute (x->content_wtr, _xml("table:number-columns-repeated"), "%d", tab_nc (tab)); xmlTextWriterEndElement (x->content_wtr); /* Deal with row headers */ - if ( tab->t > 0) + if ( tab_t (tab) > 0) xmlTextWriterStartElement (x->content_wtr, _xml("table:table-header-rows")); - for (r = 0 ; r < tab->nr; ++r) + + /* Write all the rows */ + for (r = 0 ; r < tab_nr (tab); ++r) { + int spanned_columns = 0; /* Start row definition */ xmlTextWriterStartElement (x->content_wtr, _xml("table:table-row")); - for (c = 0 ; c < tab->nc ; ++c) + /* Write all the columns */ + for (c = 0 ; c < tab_nc (tab) ; ++c) { - int opts = tab->ct[tab->nc * r + c]; - xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell")); - xmlTextWriterWriteAttribute (x->content_wtr, _xml("office:value-type"), _xml("string")); + char *s = NULL; + unsigned int opts = tab->ct[tab_nc (tab) * r + c]; + struct substring ss = tab->cc[tab_nc (tab) * r + c]; - if (! (opts & TAB_EMPTY) ) + if (opts & TAB_EMPTY) { - char *s = ss_xstrdup (tab->cc[tab->nc * r + c]); + xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell")); + xmlTextWriterEndElement (x->content_wtr); + continue; + } + + if ( opts & TAB_JOIN) + { + if ( spanned_columns == 0) + { + struct tab_joined_cell *j = (struct tab_joined_cell*) ss_data (ss); + s = ss_xstrdup (j->contents); + } + } + else + s = ss_xstrdup (ss); + + if ( spanned_columns == 0 ) + { + xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell")); + xmlTextWriterWriteAttribute (x->content_wtr, _xml("office:value-type"), _xml("string")); + + if ( opts & TAB_JOIN ) + { + struct tab_joined_cell *j = (struct tab_joined_cell*) ss_data (ss); + spanned_columns = j->x2 - j->x1; + + xmlTextWriterWriteFormatAttribute (x->content_wtr, + _xml("table:number-columns-spanned"), + "%d", spanned_columns); + } + xmlTextWriterStartElement (x->content_wtr, _xml("text:p")); - if ( r < tab->t || c < tab->l ) + + if ( r < tab_t (tab) || c < tab_l (tab) ) xmlTextWriterWriteAttribute (x->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading")); else xmlTextWriterWriteAttribute (x->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); xmlTextWriterWriteString (x->content_wtr, _xml (s)); + xmlTextWriterEndElement (x->content_wtr); /* text:p */ + xmlTextWriterEndElement (x->content_wtr); /* table:table-cell */ + } + else + { + xmlTextWriterStartElement (x->content_wtr, _xml("table:covered-table-cell")); xmlTextWriterEndElement (x->content_wtr); - free (s); } - xmlTextWriterEndElement (x->content_wtr); + if ( opts & TAB_JOIN ) + spanned_columns --; + + free (s); } xmlTextWriterEndElement (x->content_wtr); /* row */ - if ( tab->t > 0 && r == tab->t - 1) - xmlTextWriterEndElement (x->content_wtr); + if ( tab_t (tab) > 0 && r == tab_t (tab) - 1) + xmlTextWriterEndElement (x->content_wtr); /* table-header-rows */ } xmlTextWriterEndElement (x->content_wtr); /* table */ @@ -258,7 +564,7 @@ odt_submit (struct outp_driver *this, struct som_entity *e) /* ODT driver class. */ const struct outp_class odt_class = { - "odt", + "odf", 1, odt_open_driver,