Merge pull request #37 from jacobmarble/cups-media

Fix CUPS print failure when job ticket VendorID blank.
google · Jul 30, 2015 · 0390aea · 0390aea
2 parents 293dd67 + fd827fa
commit 0390aea
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/cups/cups.go b/cups/cups.go
@@ -395,7 +395,13 @@ func ticketToOptions(ticket cdd.CloudJobTicket) map[string]string {
 		}
 	}
 	if ticket.Print.MediaSize != nil {
-		m["media"] = ticket.Print.MediaSize.VendorID
+		if ticket.Print.MediaSize.VendorID != "" {
+			m["media"] = ticket.Print.MediaSize.VendorID
+		} else {
+			widthPoints := micronsToPoints(ticket.Print.MediaSize.WidthMicrons)
+			heightPoints := micronsToPoints(ticket.Print.MediaSize.HeightMicrons)
+			m["media"] = fmt.Sprintf("Custom.%sx%s", widthPoints, heightPoints)
+		}
 	}
 	if ticket.Print.Collate != nil {
 		if ticket.Print.Collate.Collate {