X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=90c2ce1915b48a90bcbc1fdad325c2552d09ab0f;hb=f1bdc3abd95899162c3cbbdb63a74145383cbb91;hp=043965eeece20d42d1c6489c0b54cf0790b29248;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git diff --git a/src/output/html.c b/src/output/html.c index 043965ee..90c2ce19 100644 --- a/src/output/html.c +++ b/src/output/html.c @@ -1,25 +1,24 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000 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 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 @@ -30,18 +29,20 @@ #include #include #include "error.h" -#include "getline.h" -#include "getlogin_r.h" #include "output.h" #include "manager.h" #include "table.h" #include -#include "size_max.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); @@ -69,7 +70,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); @@ -86,12 +87,11 @@ html_open_driver (struct outp_driver *this, struct substring options) fputs (" LINK=\"#1f00ff\" ALINK=\"#ff0000\" VLINK=\"#9900dd\">\n", x->file); print_title_tag (x->file, "H1", outp_title); print_title_tag (x->file, "H2", outp_subtitle); - free (x->chart_file_name); return true; error: - free (x->chart_file_name); + free (x->chart_file_name); this->class->close_driver (this); return false; } @@ -99,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), " "); @@ -114,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) @@ -170,19 +171,20 @@ handle_option (struct outp_driver *this, key); break; case string_arg: - switch (subcat) + switch (subcat) { case 0: free (x->file_name); x->file_name = ds_xstrdup (val); break; case 1: - if (ds_find_char (val, '#') != SIZE_MAX) + if (ds_find_char (val, '#') != SIZE_MAX) { free (x->chart_file_name); x->chart_file_name = ds_xstrdup (val); } - error (0, 0, _("`chart-files' value must contain `#'")); + else + error (0, 0, _("`chart-files' value must contain `#'")); break; default: NOT_REACHED (); @@ -191,7 +193,7 @@ handle_option (struct outp_driver *this, default: NOT_REACHED (); } - + return true; } @@ -202,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); @@ -249,7 +251,7 @@ escape_string (FILE *file, } } } - + /* Outputs content for a cell with options OPTS and contents TEXT. */ void @@ -258,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); @@ -286,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; @@ -312,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++) { @@ -326,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. */ @@ -355,46 +357,21 @@ output_tab_table (struct outp_driver *this, struct tab_table *t) fputs ("
\n\n", x->file); } static void -html_initialise_chart (struct outp_driver *this, struct chart *ch) +html_initialise_chart (struct outp_driver *this UNUSED, struct chart *ch) { -#ifdef NO_CHARTS - ch->lp = NULL; -#else struct html_driver_ext *x = this->ext; - - FILE *fp; - int number_pos; - - x->chart_cnt++; - - number_pos = strchr (x->chart_file_name, '#') - x->chart_file_name; - ch->file_name = xasprintf ("%.*s%d%s", - number_pos, x->chart_file_name, - x->chart_cnt, - x->chart_file_name + number_pos + 1); - fp = fopen (ch->file_name, "wb"); - if (fp == NULL) - { - error (0, errno, _("creating \"%s\""), ch->file_name); - free (ch->file_name); - ch->file_name = NULL; - return; - } - - ch->pl_params = pl_newplparams (); - ch->lp = pl_newpl_r ("png", 0, fp, stderr, ch->pl_params); -#endif + 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); } @@ -408,6 +385,7 @@ const struct outp_class html_class = html_open_driver, html_close_driver, + NULL, NULL, NULL,