X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fhtml.c;h=989752b627fc9c54dcbf59410c5729769a96488c;hb=0f8c9c6c05632de5cadc70ca5381c1d9cb46960e;hp=3f9c177bc5480bbf25f1f7c3dbc009a0d2c9cdab;hpb=0b344a9c8cf1300fabdaba1c2e59bfd4dd670db2;p=pspp-builds.git

diff --git a/src/output/html.c b/src/output/html.c
index 3f9c177b..989752b6 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -1,5 +1,5 @@
 /* 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
@@ -23,19 +23,21 @@
 #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"
@@ -50,13 +52,14 @@ struct html_driver
     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,
@@ -68,7 +71,7 @@ static void print_title_tag (FILE *file, const char *name,
 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);
 }
 
@@ -80,7 +83,7 @@ opt (struct output_driver *d, struct string_map *options, const char *key,
 }
 
 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;
@@ -88,17 +91,19 @@ html_create (const char *name, enum output_device_type device_type,
 
   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;
     }
 
@@ -208,6 +213,7 @@ html_destroy (struct output_driver *driver)
     }
   free (html->chart_file_name);
   free (html->file_name);
+  free (html->command_name);
   free (html);
 }
 
@@ -224,6 +230,8 @@ html_submit (struct output_driver *driver,
 {
   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");
@@ -235,6 +243,7 @@ html_submit (struct output_driver *driver,
       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);
@@ -248,6 +257,7 @@ html_submit (struct output_driver *driver,
           free (file_name);
         }
     }
+#endif  /* HAVE_CAIRO */
   else if (is_text_item (output_item))
     {
       struct text_item *text_item = to_text_item (output_item);
@@ -311,6 +321,14 @@ html_submit (struct output_driver *driver,
           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
@@ -470,10 +488,11 @@ html_output_table (struct html_driver *html, struct table_item *item)
   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,