Fix regression from PPD defaults PR.

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 154e065745718887ac76cda8b1e02af2fb3db6fd..16f16f99478734f0fa0a5230dec926d6b9032a14 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3395,16 +3395,14 @@ add_printer_defaults(cupsd_printer_t *p)/* I - Printer */
  */
 
 static void
-add_ppd_defaults_to_ipp(cupsd_printer_t *p,    /* I - Printer */
-                        ppd_file_t *ppd)       /* I - PPD file */
+add_ppd_defaults_to_ipp(
+    cupsd_printer_t *p,                        /* I - Printer */
+    ppd_file_t      *ppd)              /* I - PPD file */
 {
   ppd_option_t *option;                /* Current PPD option */
-  ppd_group_t  *group;                 /* Current PPD group */
-  const char   *ipp_name;              /* IPP attribute name */
   const char   *ipp_value;             /* IPP attribute value */
-  const char   *mapped_value;          /* Mapped IPP attribute value */
-  char         attr_name[256];         /* Attribute name buffer */
-  int          i;                      /* Looping var */
+  char         ipp_name[256],          /* Mapped attribute name buffer */
+               *ipp_ptr;               /* Pointer into buffer */
 
 
  /*
@@ -3418,117 +3416,100 @@ add_ppd_defaults_to_ipp(cupsd_printer_t *p,   /* I - Printer */
   * Loop through all PPD options and map their defaults to IPP attributes...
   */
 
-  for (group = ppd->groups; group; group = group->next)
+  for (option = (ppd_option_t *)cupsArrayFirst(ppd->options); option; option = (ppd_option_t *)cupsArrayNext(ppd->options))
   {
-    for (option = (ppd_option_t *)cupsArrayFirst(group->options);
-         option;
-        option = (ppd_option_t *)cupsArrayNext(group->options))
+   /*
+    * Skip if no default choice...
+    */
+
+    if (!option->defchoice[0])
+      continue;
+
+   /*
+    * Skip options that are already explicitly handled...
+    */
+
+    if (!strcmp(option->keyword, "PageSize") ||
+       !strcmp(option->keyword, "PageRegion") ||
+       !strcmp(option->keyword, "ColorModel") ||
+       !strcmp(option->keyword, "HPColorMode") ||
+       !strcmp(option->keyword, "BRMonoColor") ||
+       !strcmp(option->keyword, "CNIJSGrayScale") ||
+       !strcmp(option->keyword, "HPColorAsGray") ||
+       !strcmp(option->keyword, "Resolution") ||
+       !strcmp(option->keyword, "JCLResolution") ||
+       !strcmp(option->keyword, "SetResolution") ||
+       !strcmp(option->keyword, "CNRes_PGP") ||
+       !strcmp(option->keyword, "Duplex") ||
+       !strcmp(option->keyword, "EFDuplex") ||
+       !strcmp(option->keyword, "EFDuplexing") ||
+       !strcmp(option->keyword, "KD03Duplex") ||
+       !strcmp(option->keyword, "JCLDuplex") ||
+       !strcmp(option->keyword, "OutputBin") ||
+       !strcmp(option->keyword, "InputSlot") ||
+       !strcmp(option->keyword, "HPPaperSource") ||
+       !strcmp(option->keyword, "MediaType") ||
+       !strcmp(option->keyword, "DefaultMediaType") ||
+       !strcmp(option->keyword, "DefaultInputSlot"))
+      continue;
+
+   /*
+    * Map PPD option names to IPP attribute names...
+    */
+
+    if (!strcmp(option->keyword, "OutputOrder"))
     {
      /*
-      * Skip if no default choice...
+      * Map OutputOrder to page-delivery...
       */
 
-      if (!option->defchoice || !option->defchoice[0])
-       continue;
+      if (!_cups_strcasecmp(option->defchoice, "Normal"))
+        ipp_value = "same-order-face-down";
+      else
+        ipp_value = "reverse-order-face-down";
 
+      ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "page-delivery-default", NULL, ipp_value);
+    }
+    else if (!strcmp(option->keyword, "Collate"))
+    {
      /*
-      * Skip options that are already explicitly handled...
+      * Map Collate values to IPP multiple-document-handling values...
       */
 
-      if (!strcmp(option->keyword, "PageSize") ||
-          !strcmp(option->keyword, "PageRegion") ||
-          !strcmp(option->keyword, "ColorModel") ||
-          !strcmp(option->keyword, "HPColorMode") ||
-          !strcmp(option->keyword, "BRMonoColor") ||
-          !strcmp(option->keyword, "CNIJSGrayScale") ||
-          !strcmp(option->keyword, "HPColorAsGray") ||
-          !strcmp(option->keyword, "Resolution") ||
-          !strcmp(option->keyword, "JCLResolution") ||
-          !strcmp(option->keyword, "SetResolution") ||
-          !strcmp(option->keyword, "CNRes_PGP") ||
-          !strcmp(option->keyword, "Duplex") ||
-          !strcmp(option->keyword, "EFDuplex") ||
-          !strcmp(option->keyword, "EFDuplexing") ||
-          !strcmp(option->keyword, "KD03Duplex") ||
-          !strcmp(option->keyword, "JCLDuplex") ||
-          !strcmp(option->keyword, "OutputBin") ||
-          !strcmp(option->keyword, "InputSlot") ||
-          !strcmp(option->keyword, "HPPaperSource") ||
-          !strcmp(option->keyword, "MediaType") ||
-          !strcmp(option->keyword, "DefaultMediaType") ||
-          !strcmp(option->keyword, "DefaultInputSlot"))
-       continue;
+      if (!_cups_strcasecmp(option->defchoice, "True") || !_cups_strcasecmp(option->defchoice, "On") || !_cups_strcasecmp(option->defchoice, "Yes"))
+       ipp_value = "separate-documents-collated-copies";
+      else
+       ipp_value = "separate-documents-uncollated-copies";
 
+      ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "multiple-document-handling-default", NULL, ipp_value);
+    }
+    else if (!strcmp(option->keyword, "cupsPrintQuality") && !ippFindAttribute(p->attrs, "print-quality-default", IPP_TAG_ZERO))
+    {
      /*
-      * Map PPD option names to IPP attribute names...
+      * Map quality names to IPP enum values...
       */
 
-      ipp_name = NULL;
-      ipp_value = option->defchoice;
-      mapped_value = ipp_value;
-
-      if (!strcmp(option->keyword, "OutputOrder"))
-       ipp_name = "output-order";
-      else if (!strcmp(option->keyword, "Collate"))
-      {
-       ipp_name = "multiple-document-handling";
-       /*
-        * Map Collate values to IPP multiple-document-handling values...
-        */
-       if (!_cups_strcasecmp(ipp_value, "True") ||
-            !_cups_strcasecmp(ipp_value, "On") ||
-            !_cups_strcasecmp(ipp_value, "Yes"))
-       {
-         mapped_value = "separate-documents-collated-copies";
-       }
-       else
-       {
-         mapped_value = "separate-documents-uncollated-copies";
-       }
-      }
-      else if (!strcmp(option->keyword, "cupsPrintQuality") ||
-               !strcmp(option->keyword, "OutputMode"))
-      {
-       ipp_name = "print-quality";
-       /*
-        * Map quality names to IPP enum values...
-        */
-       if (!_cups_strcasecmp(ipp_value, "draft") ||
-            !_cups_strcasecmp(ipp_value, "fast"))
-       {
-         if (!ippFindAttribute(p->attrs, "print-quality-default", IPP_TAG_ZERO))
-           ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "print-quality-default", IPP_QUALITY_DRAFT);
-       }
-       else if (!_cups_strcasecmp(ipp_value, "best") ||
-                !_cups_strcasecmp(ipp_value, "high"))
-       {
-         if (!ippFindAttribute(p->attrs, "print-quality-default", IPP_TAG_ZERO))
-           ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "print-quality-default", IPP_QUALITY_HIGH);
-       }
-       else
-       {
-         if (!ippFindAttribute(p->attrs, "print-quality-default", IPP_TAG_ZERO))
-           ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "print-quality-default", IPP_QUALITY_NORMAL);
-       }
-       continue;
-      }
+      if (!_cups_strcasecmp(option->defchoice, "draft") || !_cups_strcasecmp(option->defchoice, "fast"))
+       ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "print-quality-default", IPP_QUALITY_DRAFT);
+      else if (!_cups_strcasecmp(option->defchoice, "best") || !_cups_strcasecmp(option->defchoice, "high"))
+       ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "print-quality-default", IPP_QUALITY_HIGH);
       else
-      {
-       /*
-       * For other options, convert the option name to lowercase with dashes
-       * and append "-default"...
-       */
-
-       snprintf(attr_name, sizeof(attr_name), "%s-default", option->keyword);
-       for (i = 0; attr_name[i]; i ++)
-       {
-         if (attr_name[i] >= 'A' && attr_name[i] <= 'Z')
-           attr_name[i] = (char)(attr_name[i] | 32); /* tolower */
-         else if (attr_name[i] == '_')
-           attr_name[i] = '-';
-       }
+       ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_ENUM, "print-quality-default", IPP_QUALITY_NORMAL);
+    }
+    else
+    {
+     /*
+      * For other options, convert the option name to lowercase with dashes
+      * and append "-default"...
+      */
 
-       ipp_name = attr_name;
+      snprintf(ipp_name, sizeof(ipp_name), "%s-default", option->keyword);
+      for (ipp_ptr = ipp_name; *ipp_ptr; ipp_ptr ++)
+      {
+        if (isupper(*ipp_ptr & 255))
+          *ipp_ptr = tolower(*ipp_ptr & 255);
+        else if (*ipp_ptr == '_')
+          *ipp_ptr = '-';
       }
 
      /*
@@ -3539,31 +3520,13 @@ add_ppd_defaults_to_ipp(cupsd_printer_t *p,     /* I - Printer */
        continue;
 
      /*
-      * Add the IPP "-default" attribute...
+      * Add the appropriate value...
       */
 
-      if (ipp_name && mapped_value)
-      {
-       /*
-       * For boolean options, convert to boolean...
-       */
-
-       if (option->ui == PPD_UI_BOOLEAN)
-       {
-         ippAddBoolean(p->attrs, IPP_TAG_PRINTER, ipp_name,
-                       !_cups_strcasecmp(mapped_value, "True") ||
-                       !_cups_strcasecmp(mapped_value, "On") ||
-                       !_cups_strcasecmp(mapped_value, "Yes"));
-       }
-       else
-       {
-        /*
-         * For other options, add as string/keyword...
-         */
-
-         ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, ipp_name, NULL, mapped_value);
-       }
-      }
+      if (option->ui == PPD_UI_BOOLEAN)
+       ippAddBoolean(p->attrs, IPP_TAG_PRINTER, ipp_name, !_cups_strcasecmp(option->defchoice, "True") || !_cups_strcasecmp(option->defchoice, "On") || !_cups_strcasecmp(option->defchoice, "Yes"));
+      else
+       ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_NAME, ipp_name, NULL, option->defchoice);
     }
   }
 }