X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=893c18527b7ff30e431762ede6658332e6fc5e46;hb=77ce797fbee4ea815123f46f2dbdad589fd608a2;hp=951208717f8ec7a47bc964f15262511f7c45294b;hpb=b74d09af5e07f954c18e7cdb8aca3af47fa10208;p=pspp-builds.git diff --git a/src/output/html.c b/src/output/html.c index 95120871..893c1852 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -1,46 +1,49 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "chart.h" #include "htmlP.h" #include +#include #include #include #include #include -#include +#include #include #include #include "error.h" -#include "getline.h" -#include "getlogin_r.h" #include "output.h" #include "manager.h" #include "table.h" #include -#include + +#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) +/* HTML driver options: (defaults listed first) + + output-file="pspp.html" + chart-files="pspp-#.png" +*/ + static void escape_string (FILE *file, const char *text, size_t length, const char *space); @@ -56,7 +59,9 @@ html_open_driver (struct outp_driver *this, struct substring options) this->ext = x = xmalloc (sizeof *x); x->file_name = xstrdup ("pspp.html"); + x->chart_file_name = xstrdup ("pspp-#.png"); x->file = NULL; + x->chart_cnt = 0; outp_parse_options (options, handle_option, this); @@ -66,7 +71,7 @@ html_open_driver (struct outp_driver *this, struct substring options) error (0, errno, _("opening HTML output file: %s"), x->file_name); goto error; } - + fputs ("\n", x->file); fputs ("\n", x->file); @@ -94,9 +99,9 @@ html_open_driver (struct outp_driver *this, struct substring options) /* Emits CONTENT to the output, escaping CONTENT as necessary for HTML. */ static void -print_title_tag (FILE *file, const char *name, const char *content) +print_title_tag (FILE *file, const char *name, const char *content) { - if (content != NULL) + if (content != NULL) { fprintf (file, "<%s>", name); escape_string (file, content, strlen (content), " "); @@ -109,25 +114,26 @@ html_close_driver (struct outp_driver *this) { struct html_driver_ext *x = this->ext; bool ok; - - if (x->file != NULL) + + if (x->file != NULL) { fprintf (x->file, "\n" "\n" "\n"); ok = fn_close (x->file_name, x->file) == 0; - x->file = NULL; + x->file = NULL; } else ok = true; + free (x->chart_file_name); free (x->file_name); free (x); - + return ok; } -/* Link the image contained in FILE_NAME to the +/* Link the image contained in FILE_NAME to the HTML stream in FILE. */ static void link_image (FILE *file, char *file_name) @@ -143,9 +149,10 @@ enum }; /* All the options that the HTML driver supports. */ -static struct outp_option option_tab[] = +static const struct outp_option option_tab[] = { {"output-file", string_arg, 0}, + {"chart-files", string_arg, 1}, {NULL, 0, 0}, }; @@ -164,13 +171,29 @@ handle_option (struct outp_driver *this, key); break; case string_arg: - free (x->file_name); - x->file_name = ds_xstrdup (val); + switch (subcat) + { + case 0: + free (x->file_name); + x->file_name = ds_xstrdup (val); + break; + case 1: + if (ds_find_char (val, '#') != SIZE_MAX) + { + free (x->chart_file_name); + x->chart_file_name = ds_xstrdup (val); + } + else + error (0, 0, _("`chart-files' value must contain `#'")); + break; + default: + NOT_REACHED (); + } break; default: - abort (); + NOT_REACHED (); } - + return true; } @@ -181,10 +204,10 @@ html_submit (struct outp_driver *this, struct som_entity *s) { extern struct som_table_class tab_table_class; struct html_driver_ext *x = this->ext; - + assert (s->class == &tab_table_class ) ; - switch (s->type) + switch (s->type) { case SOM_TABLE: output_tab_table ( this, (struct tab_table *) s->ext); @@ -193,7 +216,7 @@ html_submit (struct outp_driver *this, struct som_entity *s) link_image (x->file, ((struct chart *)s->ext)->file_name); break; default: - abort (); + NOT_REACHED (); } } @@ -228,7 +251,7 @@ escape_string (FILE *file, } } } - + /* Outputs content for a cell with options OPTS and contents TEXT. */ void @@ -237,23 +260,23 @@ html_put_cell_contents (struct outp_driver *this, { struct html_driver_ext *x = this->ext; - if (!(opts & TAB_EMPTY)) + if (!(opts & TAB_EMPTY)) { if (opts & TAB_EMPH) fputs ("", x->file); - if (opts & TAB_FIX) + if (opts & TAB_FIX) { fputs ("", x->file); escape_string (x->file, ss_data (text), ss_length (text), " "); fputs ("", x->file); } - else + else { size_t initial_spaces = ss_span (text, ss_cstr (CC_SPACES)); escape_string (x->file, ss_data (text) + initial_spaces, ss_length (text) - initial_spaces, - " "); + " "); } if (opts & TAB_EMPH) fputs ("", x->file); @@ -265,25 +288,25 @@ static void output_tab_table (struct outp_driver *this, struct tab_table *t) { struct html_driver_ext *x = this->ext; - + if (t->nr == 1 && t->nc == 1) { fputs ("

", x->file); html_put_cell_contents (this, t->ct[0], *t->cc); fputs ("

\n", x->file); - + return; } fputs ("\n", x->file); - + if (t->title != NULL) { fprintf (x->file, " \n", x->file); } - + { int r; unsigned char *ct = t->ct; @@ -291,7 +314,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) for (r = 0; r < t->nr; r++) { int c; - + fputs (" \n", x->file); for (c = 0; c < t->nc; c++, ct++) { @@ -305,7 +328,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) j = (struct tab_joined_cell *) ss_data (*cc); cc = &j->contents; if (j->x1 != c || j->y1 != r) - continue; + continue; } /* Output \n", x->file); } } - + fputs ("
"); escape_string (x->file, t->title, strlen (t->title), " "); fputs ("
or tag. */ @@ -334,37 +357,27 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) fputs ("
\n\n", x->file); } static void -html_initialise_chart(struct outp_driver *d UNUSED, struct chart *ch) +html_initialise_chart (struct outp_driver *this UNUSED, struct chart *ch) { - - FILE *fp; - - make_unique_file_stream(&fp, &ch->file_name); - -#ifdef NO_CHARTS - ch->lp = 0; -#else - ch->pl_params = pl_newplparams(); - ch->lp = pl_newpl_r ("png", 0, fp, stderr, ch->pl_params); -#endif - + struct html_driver_ext *x = this->ext; + chart_init_separate (ch, "png", x->chart_file_name, ++x->chart_cnt); } -static void +static void html_finalise_chart(struct outp_driver *d UNUSED, struct chart *ch) { - free(ch->file_name); + chart_finalise_separate (ch); } /* HTML driver class. */ -struct outp_class html_class = +const struct outp_class html_class = { "html", 1, @@ -372,6 +385,7 @@ struct outp_class html_class = html_open_driver, html_close_driver, + NULL, NULL, NULL,