/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010 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
#include <time.h>
#include <unistd.h>
-#include <data/file-name.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/compiler.h>
-#include <libpspp/version.h>
-#include <output/cairo.h>
-#include <output/chart-item.h>
-#include <output/driver-provider.h>
-#include <output/options.h>
-#include <output/output-item-provider.h>
-#include <output/table-provider.h>
-#include <output/table-item.h>
-#include <output/text-item.h>
+#include "data/file-name.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/version.h"
+#include "output/cairo.h"
+#include "output/chart-item.h"
+#include "output/driver-provider.h"
+#include "output/message-item.h"
+#include "output/options.h"
+#include "output/output-item-provider.h"
+#include "output/table-provider.h"
+#include "output/table-item.h"
+#include "output/text-item.h"
#include "error.h"
#include "xalloc.h"
char *file_name;
char *chart_file_name;
+ char *command_name;
FILE *file;
size_t chart_cnt;
bool in_syntax;
};
-const struct output_driver_class html_class;
+static const struct output_driver_class html_driver_class;
static void html_output_table (struct html_driver *, struct table_item *);
static void escape_string (FILE *file,
static struct html_driver *
html_driver_cast (struct output_driver *driver)
{
- assert (driver->class == &html_class);
+ assert (driver->class == &html_driver_class);
return UP_CAST (driver, struct html_driver, driver);
}
}
static struct output_driver *
-html_create (const char *name, enum output_device_type device_type,
+html_create (const char *file_name, enum settings_output_devices device_type,
struct string_map *o)
{
struct output_driver *d;
html = xzalloc (sizeof *html);
d = &html->driver;
- output_driver_init (&html->driver, &html_class, name, device_type);
- html->file_name = parse_string (opt (d, o, "output-file", "pspp.html"));
- html->chart_file_name = parse_chart_file_name (opt (d, o, "chart-files",
- "pspp-#.png"));
+ output_driver_init (&html->driver, &html_driver_class, file_name,
+ device_type);
+
+ html->file_name = xstrdup (file_name);
+ html->chart_file_name = parse_chart_file_name (opt (d, o, "charts",
+ file_name));
html->file = NULL;
html->chart_cnt = 1;
html->file = fn_open (html->file_name, "w");
if (html->file == NULL)
{
- error (0, errno, _("opening HTML output file: %s"), html->file_name);
+ error (0, errno, _("error opening output file `%s'"), html->file_name);
goto error;
}
fputs ("<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\n",
html->file);
fputs ("<META HTTP-EQUIV=\"Content-Type\" "
- "CONTENT=\"text/html; charset=ISO-8859-1\">\n", html->file);
- fputs ("<STYLE>\n"
+ "CONTENT=\"text/html; charset=utf-8\">\n", html->file);
+ fputs ("<STYLE TYPE=\"text/css\">\n"
"<!--\n"
"body {\n"
" background: white;\n"
}
free (html->chart_file_name);
free (html->file_name);
+ free (html->command_name);
free (html);
}
{
struct html_driver *html = html_driver_cast (driver);
+ output_driver_track_current_command (output_item, &html->command_name);
+
if (html->in_syntax && !is_syntax_item (output_item))
{
fprintf (html->file, "</PRE>\n");
struct table_item *table_item = to_table_item (output_item);
html_output_table (html, table_item);
}
+#ifdef HAVE_CAIRO
else if (is_chart_item (output_item) && html->chart_file_name != NULL)
{
struct chart_item *chart_item = to_chart_item (output_item);
html->chart_cnt++);
if (file_name != NULL)
{
- fprintf (html->file, "<IMG SRC=\"%s\"/>", file_name);
+ const char *title = chart_item_get_title (chart_item);
+ fprintf (html->file, "<IMG SRC=\"%s\" ALT=\"Chart: %s\">",
+ file_name, title ? title : _("No description"));
free (file_name);
}
}
+#endif /* HAVE_CAIRO */
else if (is_text_item (output_item))
{
struct text_item *text_item = to_text_item (output_item);
break;
}
}
+ else if (is_message_item (output_item))
+ {
+ const struct message_item *message_item = to_message_item (output_item);
+ const struct msg *msg = message_item_get_msg (message_item);
+ char *s = msg_to_string (msg, html->command_name);
+ print_title_tag (html->file, "P", s);
+ free (s);
+ }
}
/* Write LENGTH characters in TEXT to file F, escaping characters
alignment = cell.options & TAB_ALIGNMENT;
if (alignment != TAB_LEFT)
- fprintf (html->file, " ALIGN=%s",
+ fprintf (html->file, " ALIGN=\"%s\"",
alignment == TAB_RIGHT ? "RIGHT" : "CENTER");
colspan = table_cell_colspan (&cell);
if (colspan > 1)
- fprintf (html->file, " COLSPAN=%d", colspan);
+ fprintf (html->file, " COLSPAN=\"%d\"", colspan);
rowspan = table_cell_rowspan (&cell);
if (rowspan > 1)
- fprintf (html->file, " ROWSPAN=%d", rowspan);
+ fprintf (html->file, " ROWSPAN=\"%d\"", rowspan);
/* Cell borders. */
n_borders = 0;
if (n_borders > 0)
fputs ("\"", html->file);
- if (top > TAL_GAP || bottom > TAL_GAP
- || left > TAL_GAP || right > TAL_GAP)
- {
- fputs (" STYLE=\"", html->file);
- if (top > TAL_GAP)
- fprintf (html->file, "border-top: %s",
- top == TAL_1 ? "thin solid" : "double");
-
- if (top > TAL_GAP && left > TAL_GAP)
- fputs ("; ", html->file);
-
- if (left > TAL_GAP)
- fprintf (html->file, "border-left: %s",
- left == TAL_1 ? "thin solid" : "double");
- fputs ("\"", html->file);
- }
-
putc ('>', html->file);
/* Output cell contents. */
fputs ("</TABLE>\n\n", html->file);
}
-const struct output_driver_class html_class =
+struct output_driver_factory html_driver_factory = { "html", html_create };
+
+static const struct output_driver_class html_driver_class =
{
"html",
- html_create,
html_destroy,
html_submit,
NULL,