Save work on banners.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7996 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/doc/help/spec-banner.html b/doc/help/spec-banner.html
index 323437978bbf934137ee49692a7778aef2ee9bbe..818cf67eca8f85737a031dccc8f2d61c89d1aff5 100644 (file)
--- a/doc/help/spec-banner.html
+++ b/doc/help/spec-banner.html
@@ -98,11 +98,11 @@ the job information.</p>
 <h3><a name='Show'>Show</a></h3>
 
 <p class='summary'>
-Show <em>keyword keyword ... keyword</em>
+Show <em>value value ... value</em>
 </p>
 
 <p>The <code>Show</code> key lists the job information that is shown. The
-following keywords are supported:</p>
+following values are supported:</p>
 
 <ul>
 
@@ -126,6 +126,10 @@ following keywords are supported:</p>
        <li><code>options</code>: The options that were provided with the
        job</li>
 
+       <li><code>paper-name</code>: The name of the paper size used</li>
+
+       <li><code>paper-size</code>: The dimensions of the paper size used.</li>
+
        <li><code>printer-driver-name</code>: The printer driver used</li>
 
        <li><code>printer-driver-version</code>: The driver version</li>
@@ -141,6 +145,8 @@ following keywords are supported:</p>
 
        <li><code>time-at-creation</code>: When the job was submitted</li>
 
+       <li><code>time-at-processing</code>: The current date and time</li>
+
 </ul>
 
 

diff --git a/filter/bannertops.c b/filter/bannertops.c
index 47df8c8582d2aab3da08e28485eee5d8a0be0be6..f3b2933842e6566f37f9d9aaf5f39d54ec250395 100644 (file)
--- a/filter/bannertops.c
+++ b/filter/bannertops.c
@@ -27,15 +27,52 @@
 
 
 /*
- * Globals...
+ * Constants...
  */
 
+#define SHOW_IMAGEABLE_AREA            1       /* Show imageable area */
+#define SHOW_JOB_BILLING               2       /* Show billing string */
+#define SHOW_JOB_ID                    4       /* Show job ID */
+#define SHOW_JOB_NAME                  8       /* Show job title */
+#define SHOW_JOB_ORIGINATING_USER_NAME 16      /* Show owner of job */
+#define SHOW_JOB_ORIGINATING_HOST_NAME 32      /* Show submitting system */
+#define SHOW_JOB_UUID                  64      /* Show job UUID */
+#define SHOW_OPTIONS                   128     /* Show print options */
+#define SHOW_PAPER_NAME                        256     /* Show paper size name */
+#define SHOW_PAPER_SIZE                        512     /* Show paper dimensions */
+#define SHOW_PRINTER_DRIVER_NAME       1024    /* Show printer driver name */
+#define SHOW_PRINTER_DRIVER_VERSION    2048    /* Show printer driver version */
+#define SHOW_PRINTER_INFO              4096    /* Show printer description */
+#define SHOW_PRINTER_LOCATION          8192    /* Show printer location */
+#define SHOW_PRINTER_MAKE_AND_MODEL    16384   /* Show printer make and model */
+#define SHOW_PRINTER_NAME              32768   /* Show printer queue ID */
+#define SHOW_TIME_AT_CREATION          65536   /* Show date/time when submitted */
+#define SHOW_TIME_AT_PROCESSING                131072  /* Show date/time when printed */
+
+
+/*
+ * Structures...
+ */
+
+typedef struct banner_file_s           /**** Banner file data ****/
+{
+  int          show;                   /* What to show */
+  char         *header,                /* Header text */
+               *footer;                /* Footer text */
+  cups_array_t *notices,               /* Notices to show */
+               *images;                /* Images to show */
+} banner_file_t;
+
+
 /*
  * Local functions...
  */
 
-static void    write_epilogue(int num_pages);
-ps_text_t      *write_prolog(const char *title, const char *user);
+static banner_file_t   *load_banner(const char *filename);
+static int             write_banner(ppd_file_t *ppd, ps_text_t *fonts,
+                                    banner_file_t *banner);
+static void            write_epilogue(int num_pages);
+static ps_text_t       *write_prolog(const char *title, const char *user);
 
 
 /*
@@ -131,6 +168,215 @@ main(int  argc,                           /* I - Number of command-line args */
 }
 
 
+/*
+ * 'load_banner()' - Load the banner file.
+ */
+
+static banner_file_t *                 /* O - Banner file data */
+load_banner(const char *filename)      /* I - Filename or NULL for stdin */
+{
+  cups_file_t  *fp;                    /* File */
+  char         line[2048],             /* Line buffer */
+               *ptr;                   /* Pointer into line */
+  int          linenum;                /* Current line number */
+  banner_file_t        *banner;                /* Banner file data */
+  const char   *cups_docroot;          /* CUPS_DOCROOT environment variable */
+
+
+ /*
+  * Open the banner file...
+  */
+
+  if (filename)
+    fp = cupsFileStdin();
+  else
+    fp = cupsFileOpen(filename, "r");
+
+  if (!fp)
+  {
+    _cupsLangPrintf(stderr,
+                   _("ERROR: Unable to open banner file \"%s\" - %s\n"),
+                    filename ? filename : "(stdin)", strerror(errno));
+    exit(1);
+  }
+
+ /*
+  * Read the banner file...
+  */
+
+  if ((cups_docroot = getenv("CUPS_DOCROOT")) == NULL)
+    cups_docroot = CUPS_DOCROOT;
+
+  banner  = calloc(1, sizeof(banner_file_t));
+  linenum = 0;
+
+  while (cupsFileGets(fp, line, sizeof(line)))
+  {
+   /*
+    * Skip blank and comment lines...
+    */
+
+    linenum ++;
+
+    if (line[0] == '#' || !line[0])
+      continue;
+
+   /*
+    * Break the line into keyword and value parts...
+    */
+
+    for (ptr = line; *ptr && !isspace(*ptr & 255); ptr ++);
+
+    while (isspace(*ptr & 255))
+      *ptr++ = '\0';
+
+    if (!*ptr)
+    {
+      _cupsLangPrintf(stderr,
+                      _("ERROR: Missing value on line %d of banner file!\n"),
+                     linenum);
+      continue;
+    }
+
+   /*
+    * Save keyword values in the appropriate places...
+    */
+
+    if (!strcasecmp(line, "Footer"))
+    {
+      if (banner->footer)
+        fprintf(stderr, "DEBUG: Extra \"Footer\" on line %d of banner file!\n",
+               linenum);
+      else
+        banner->footer = strdup(ptr);
+    }
+    else if (!strcasecmp(line, "Header"))
+    {
+      if (banner->header)
+        fprintf(stderr, "DEBUG: Extra \"Header\" on line %d of banner file!\n",
+               linenum);
+      else
+        banner->header = strdup(ptr);
+    }
+    else if (!strcasecmp(line, "Image"))
+    {
+      char     imagefile[1024];        /* Image filename */
+
+
+      if (ptr[0] == '/')
+        strlcpy(imagefile, ptr, sizeof(imagefile));
+      else
+        snprintf(imagefile, sizeof(imagefile), "%s/%s", cups_docroot, ptr);
+
+      if (access(imagefile, R_OK))
+      {
+        fprintf(stderr, "DEBUG: Image \"%s\" on line %d of banner file: %s\n",
+               ptr, linenum, strerror(errno));
+      }
+      else
+      {
+        if (!banner->images)
+         banner->images = cupsArrayNew(NULL, NULL);
+
+        cupsArrayAdd(banner->images, strdup(imagefile));
+      }
+    }
+    else if (!strcasecmp(line, "Notice"))
+    {
+      if (!banner->notices)
+       banner->notices = cupsArrayNew(NULL, NULL);
+
+      cupsArrayAdd(banner->notices, strdup(ptr));
+    }
+    else if (!strcasecmp(line, "Show"))
+    {
+      char     *value;                 /* Current value */
+
+
+      for (value = ptr; *value; value = ptr)
+      {
+       /*
+       * Find the end of the current value
+       */
+
+        while (*ptr && !isspace(*ptr & 255))
+         ptr ++;
+
+        while (*ptr && isspace(*ptr & 255))
+         *ptr++ = '\0';
+
+       /*
+        * Add the value to the show flags...
+       */
+       if (!strcasecmp(value, "imageable-area"))
+         banner->show |= SHOW_IMAGEABLE_AREA;
+       else if (!strcasecmp(value, "job-billing"))
+         banner->show |= SHOW_JOB_BILLING;
+       else if (!strcasecmp(value, "job-id"))
+         banner->show |= SHOW_JOB_ID;
+       else if (!strcasecmp(value, "job-name"))
+         banner->show |= SHOW_JOB_NAME;
+       else if (!strcasecmp(value, "job-originating-host-name"))
+         banner->show |= SHOW_JOB_ORIGINATING_HOST_NAME;
+       else if (!strcasecmp(value, "job-originating-user-name"))
+         banner->show |= SHOW_JOB_ORIGINATING_USER_NAME;
+       else if (!strcasecmp(value, "job-uuid"))
+         banner->show |= SHOW_JOB_UUID;
+       else if (!strcasecmp(value, "options"))
+         banner->show |= SHOW_OPTIONS;
+       else if (!strcasecmp(value, "paper-name"))
+         banner->show |= SHOW_PAPER_NAME;
+       else if (!strcasecmp(value, "paper-size"))
+         banner->show |= SHOW_PAPER_SIZE;
+       else if (!strcasecmp(value, "printer-driver-name"))
+         banner->show |= SHOW_PRINTER_DRIVER_NAME;
+       else if (!strcasecmp(value, "printer-driver-version"))
+         banner->show |= SHOW_PRINTER_DRIVER_VERSION;
+       else if (!strcasecmp(value, "printer-info"))
+         banner->show |= SHOW_PRINTER_INFO;
+       else if (!strcasecmp(value, "printer-location"))
+         banner->show |= SHOW_PRINTER_LOCATION;
+       else if (!strcasecmp(value, "printer-make-and-model"))
+         banner->show |= SHOW_PRINTER_MAKE_AND_MODEL;
+       else if (!strcasecmp(value, "printer-name"))
+         banner->show |= SHOW_PRINTER_NAME;
+       else if (!strcasecmp(value, "time-at-creation"))
+         banner->show |= SHOW_TIME_AT_CREATION;
+       else if (!strcasecmp(value, "time-at-processing"))
+         banner->show |= SHOW_TIME_AT_PROCESSING;
+       else
+        {
+         fprintf(stderr,
+                 "DEBUG: Unknown \"Show\" value \"%s\" on line %d of banner "
+                 "file!\n", value, linenum);
+       }
+      }
+    }
+    else
+      fprintf(stderr, "DEBUG: Unknown key \"%s\" on line %d of banner file!\n",
+              line, linenum);
+  }
+
+  if (filename)
+    cupsFileClose(fp);
+
+  return (banner);
+}
+
+
+/*
+ * 'write_banner()' - Write a banner page...
+ */
+
+static int                             /* O - Number of pages */
+write_banner(ppd_file_t    *ppd,       /* I - PPD file */
+             ps_text_t     *fonts,     /* I - Fonts */
+            banner_file_t *banner)     /* I - Banner file */
+{
+  return (1);
+}
+
+
 /*
  * 'write_epilogue()' - Write the PostScript file epilogue.
  */