# HG changeset patch
# User LordOfWar
# Date 2009-10-14 14:58:38
# Node ID f448bf62fb9809fe9484ed8156ee224a6821bfcb
# Parent  f3f23306d2b91762d67e164b986ad2bc42917d57

fixed up user interface and made it looked pretty
all commands work except 3, haven't tried 5

diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -314,14 +314,18 @@ void distrenjob_enqueue(struct distrenjo
   struct distrenjob *current_job;     // create pointer to current_job (which job is being compared to)
 
   // iterate through linked list of jobs
-  for(current_job = head->next; 1; current_job = current_job->next){
+  for(current_job = head->next; 1; current_job = current_job->next)
+  {
+	fprintf(stderr, "enqueue loop iteration\n");
     if(current_job == NULL){ // if it has reached the end of the list, add job there
       prev_job->next = job;
+      fprintf(stderr, "adding job at end of queue\n");
       break;
     }
     else if(job->priority < current_job->priority){ // if job's priority is less than current_job's priority, insert job
       prev_job->next = job;                        // keep in mind 1 is the highest priority given to jobs, head has a
       job->next = current_job;                     // priority of zero so it will always be before other jobs
+      fprintf(stderr, "adding job before jobname: %s\n", current_job->name);
       break;
     }
 
@@ -841,7 +845,7 @@ int reCreateQueueFromXML(struct distrenj
 }
 
 /* ************************** Test Functions ************************* */
-void printFrameInfo(struct frameset *frame)
+int printFrameInfo(struct frameset *frame)
 {
   char *status;
 
@@ -862,48 +866,56 @@ void printFrameInfo(struct frameset *fra
       _distren_asprintf(&status, "%s", "canceled");
   }
 
-  printf("frame #: %d --> %s", frame->num, status);
+  printf("frame #: %d --> %s\n", frame->num, status);
+
+  return 1;
 }
 
-void printJob(struct distrenjob *job)
+int printJob(struct distrenjob *job)
 {
   int counter;
-  printf("frame_num: status");
+  fprintf(stderr, "frame_num: status\n");
   for(counter = 0; counter < job->total_frames; counter++)
     {
       printFrameInfo(&job->frameset[counter]);
     }
+
+  return 1;
 }
 
-void printJobInfo(struct distrenjob *job)
+int printJobInfo(struct distrenjob *job)
 {
-  printf("type: %d", job->type);
-  printf("name: %s", job->email);
-  printf("submitter: %s", job->submitter);
-  printf("e-mail: %s", job->email);
-  printf("priority, %d", job->priority);
-  printf("completed: %d", job->completed_frames);
-  printf("assigned: %d", job->assigned_frames);
-  printf("total: %d", job->total_frames);
-  printf("watchdog: %d", job->watchdog_forgiveness);
-  printf("hibernate: %d", job->hibernate);
-  printf("prev_frame: %d", job->prev_frame_index);
+  fprintf(stderr, "type: %d\n", job->type);
+  fprintf(stderr, "name: %s\n", job->email);
+  fprintf(stderr, "submitter: %s\n", job->submitter);
+  fprintf(stderr, "e-mail: %s\n", job->email);
+  fprintf(stderr, "priority, %d\n", job->priority);
+  fprintf(stderr, "completed: %d\n", job->completed_frames);
+  fprintf(stderr, "assigned: %d\n", job->assigned_frames);
+  fprintf(stderr, "total: %d\n", job->total_frames);
+  fprintf(stderr, "watchdog: %d\n", job->watchdog_forgiveness);
+  fprintf(stderr, "hibernate: %d\n", job->hibernate);
+  fprintf(stderr, "prev_frame: %d\n", job->prev_frame_index);
+
+  return 1;
 }
 
-void printAllJobnums(struct distrenjob *head)
+int printAllJobnums(struct distrenjob *head)
 {
   struct distrenjob *current_job;
   int total_jobs;
-  printf("job numbers in the order they will be processed:");
+  fprintf(stderr, "job numbers in the order they will be processed:\n");
 
   total_jobs = 0;
-  for(current_job = head; !current_job; current_job = current_job->next)
+  for(current_job = head->next; current_job; current_job = current_job->next)
     {
-      printf("%d", current_job->jobnum);
+      fprintf(stderr, "%d: %s\n", current_job->jobnum, current_job->name);
       total_jobs++;
     }
 
-  printf("%d jobs in queue", total_jobs);
+  fprintf(stderr, "%d jobs in queue\n", total_jobs);
+
+  return 1;
 }
 
 /* ************************** Main ************************* */