Refactoring: 2nd step and a working state.

1 files changed, 17 insertions, 9 deletions

diff --git a/cgi.c b/cgi.c
index 128eae7..81149af 100644
--- a/cgi.c
+++ b/cgi.c
@@ -42,12 +42,16 @@ static const char * line1 = NULL, * line2 = NULL;
 
 int print_on_correct_printer(void * user_data, unsigned flags, cups_dest_t * dest) {
         if(!strstr(dest->name, user_data)) {
-                printf("> Wrong name: %s continue search\n", dest->name);
+                // DEBUG("> Wrong printer name: '%s'; try next printer...\n", dest->name);
                 return 1;
         }
 
-        if(!dest || !line1 || !line2) {
-                printf("FAILED: %p %p %p\n", dest, line1, line2);
+        DEBUG("> Correct printer found: %s\n", dest->name);
+
+        if(!dest
+        || !line1
+        || !line2) {
+                DEBUG("> Nothing to print or printer not found: %p %p %p\n", dest, line1, line2);
                 return 1;
         }
 
@@ -63,20 +67,22 @@ int print_on_correct_printer(void * user_data, unsigned flags, cups_dest_t * des
         cups_dinfo_t * info = cupsCopyDestInfo(CUPS_HTTP_DEFAULT, dest);
 
         if (cupsCreateDestJob(CUPS_HTTP_DEFAULT, dest, info, &job_id, "My Document", num_options, options) == IPP_STATUS_OK)
-                printf("Created job: %d\n", job_id);
+                DEBUG("> Created job: %d\n", job_id);
         else
-                printf("Unable to create job: %s\n", cupsLastErrorString());
+                DEBUG("> Unable to create job: %s\n", cupsLastErrorString());
 
         if (cupsStartDestDocument(CUPS_HTTP_DEFAULT, dest, info, job_id, "filename.pdf", CUPS_FORMAT_TEXT, num_options, options, 1) == HTTP_STATUS_CONTINUE)
         {
+                DEBUG("> printing label:\n>\t%s\n>\t%s\n", line1, line2);
+
                 cupsWriteRequestData(CUPS_HTTP_DEFAULT, line1, strlen(line1));
                 cupsWriteRequestData(CUPS_HTTP_DEFAULT, "\n", 1);
                 cupsWriteRequestData(CUPS_HTTP_DEFAULT, line2, strlen(line2));
 
                 if (cupsFinishDestDocument(CUPS_HTTP_DEFAULT, dest, info) == IPP_STATUS_OK)
-                        puts("Document send succeeded.");
+                        DEBUG("> Document send succeeded.");
                 else
-                        printf("Document send failed: %s\n", cupsLastErrorString());
+                        DEBUG("> Document send failed: %s\n", cupsLastErrorString());
         }
         return 0;
 }
@@ -116,16 +122,18 @@ void send_answer(Http_Header * http_header, FILE * f) {
                         print_on_correct_printer,
                         printer_name
                         );
+
         line1 = NULL;
         line2 = NULL;
 
         send_answer_file(http_header, f);
 }
 
-
 void next_part(Http_Header * http_header, const char * content, size_t content_size) {
-        if(!http_header->content_disposition)
+        if(!http_header->content_disposition) {
+                DEBUG("> No Content-Disposition header found\n");
                 return;
+        }
 
         if(strstr(http_header->content_disposition, "name=\"line1\"")) {
                 line1 = content;