-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
- 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 <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "chart.h"
#include <unistd.h>
#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <data/file-name.h>
#include "error.h"
#include "getline.h"
-#include "getlogin_r.h"
#include "output.h"
#include "manager.h"
#include "table.h"
#include <libpspp/version.h>
-#include <data/make-file.h>
+
+#include "size_max.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
const char *content);
static bool
-html_open_driver (struct outp_driver *this, const struct string *options)
+html_open_driver (struct outp_driver *this, struct substring options)
{
struct html_driver_ext *x;
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);
error (0, errno, _("opening HTML output file: %s"), x->file_name);
goto error;
}
-
+
fputs ("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n"
" \"http://www.w3.org/TR/html4/loose.dtd\">\n", x->file);
fputs ("<HTML>\n", x->file);
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);
this->class->close_driver (this);
return false;
}
/* Emits <NAME>CONTENT</NAME> 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), " ");
{
struct html_driver_ext *x = this->ext;
bool ok;
-
- if (x->file != NULL)
+
+ if (x->file != NULL)
{
fprintf (x->file,
"</BODY>\n"
"</HTML>\n"
"<!-- end of file -->\n");
ok = fn_close (x->file_name, x->file) == 0;
- x->file = NULL;
+ x->file = NULL;
}
else
ok = true;
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)
};
/* 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},
};
key);
break;
case string_arg:
- free (x->file_name);
- x->file_name = xstrdup (ds_c_str (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);
+ }
+ error (0, 0, _("`chart-files' value must contain `#'"));
+ break;
+ default:
+ NOT_REACHED ();
+ }
break;
default:
- abort ();
+ NOT_REACHED ();
}
-
+
return true;
}
{
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);
link_image (x->file, ((struct chart *)s->ext)->file_name);
break;
default:
- abort ();
+ NOT_REACHED ();
}
}
}
}
}
-
+
/* Outputs content for a cell with options OPTS and contents
TEXT. */
void
html_put_cell_contents (struct outp_driver *this,
- unsigned int opts, struct fixed_string *text)
+ unsigned int opts, const struct substring text)
{
struct html_driver_ext *x = this->ext;
- if (!(opts & TAB_EMPTY))
+ if (!(opts & TAB_EMPTY))
{
if (opts & TAB_EMPH)
fputs ("<EM>", x->file);
- if (opts & TAB_FIX)
+ if (opts & TAB_FIX)
{
fputs ("<TT>", x->file);
- escape_string (x->file, ls_c_str (text), ls_length (text), " ");
+ escape_string (x->file, ss_data (text), ss_length (text), " ");
fputs ("</TT>", x->file);
}
- else
+ else
{
- size_t initial_spaces = strspn (ls_c_str (text), " \t");
+ size_t initial_spaces = ss_span (text, ss_cstr (CC_SPACES));
escape_string (x->file,
- ls_c_str (text) + initial_spaces,
- ls_length (text) - initial_spaces,
- " ");
+ ss_data (text) + initial_spaces,
+ ss_length (text) - initial_spaces,
+ " ");
}
if (opts & TAB_EMPH)
fputs ("</EM>", x->file);
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 ("<P>", x->file);
- html_put_cell_contents (this, t->ct[0], t->cc);
+ html_put_cell_contents (this, t->ct[0], *t->cc);
fputs ("</P>\n", x->file);
-
+
return;
}
fputs ("<TABLE BORDER=1>\n", x->file);
-
- if (!ls_empty_p (&t->title))
+
+ if (t->title != NULL)
{
fprintf (x->file, " <CAPTION>");
- escape_string (x->file, ls_c_str (&t->title), ls_length (&t->title),
- " ");
+ escape_string (x->file, t->title, strlen (t->title), " ");
fputs ("</CAPTION>\n", x->file);
}
-
+
{
int r;
unsigned char *ct = t->ct;
for (r = 0; r < t->nr; r++)
{
int c;
-
+
fputs (" <TR>\n", x->file);
for (c = 0; c < t->nc; c++, ct++)
{
- struct fixed_string *cc;
+ struct substring *cc;
const char *tag;
struct tab_joined_cell *j = NULL;
cc = t->cc + c + r * t->nc;
if (*ct & TAB_JOIN)
{
- j = (struct tab_joined_cell *) ls_c_str (cc);
+ j = (struct tab_joined_cell *) ss_data (*cc);
cc = &j->contents;
if (j->x1 != c || j->y1 != r)
- continue;
+ continue;
}
/* Output <TD> or <TH> tag. */
putc ('>', x->file);
/* Output cell contents. */
- html_put_cell_contents (this, *ct, cc);
+ html_put_cell_contents (this, *ct, *cc);
/* Output </TH> or </TD>. */
fprintf (x->file, "</%s>\n", tag);
fputs (" </TR>\n", x->file);
}
}
-
+
fputs ("</TABLE>\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)
{
+#ifdef NO_CHARTS
+ ch->lp = NULL;
+#else
+ struct html_driver_ext *x = this->ext;
- FILE *fp;
+ FILE *fp;
+ int number_pos;
- make_unique_file_stream(&fp, &ch->file_name);
+ x->chart_cnt++;
-#ifdef NO_CHARTS
- ch->lp = 0;
-#else
- ch->pl_params = pl_newplparams();
+ number_pos = strchr (x->chart_file_name, '#') - x->chart_file_name;
+ ch->file_name = xasprintf ("%.*s%d%s",
+ number_pos, x->chart_file_name,
+ (int) 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
-
}
-static void
+static void
html_finalise_chart(struct outp_driver *d UNUSED, struct chart *ch)
{
free(ch->file_name);
/* HTML driver class. */
-struct outp_class html_class =
+const struct outp_class html_class =
{
"html",
1,
projects / pspp-builds.git / blobdiff