# HG changeset patch
# User LordOfWar
# Date 2009-10-01 00:39:14
# Node ID 8f09d07c0f15903b88c309f0f3d9444ecdfffb07
# Parent  20a058f57a348c26c5592d7662334aee6fb3c4fc

printJobInfo() no longer needs &head passed to it
added more to user interface in main() function

diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -470,7 +470,7 @@ void printJob(struct distrenjob *job)
     }
 }
 
-void printJobInfo(struct distrenjob *head, struct distrenjob *job)
+void printJobInfo(struct distrenjob *job)
 {
   printf("type: %d", job->type);
   printf("name: %s", job->email);
@@ -535,39 +535,66 @@ int main(int argc, char *argv[])
 
   distrend_do_config(argc, argv, &config);
 
+  int command;
+  jobnum_t jobnum;
+  struct distrenjob *tmp_job;
+  struct frameset *tmp_frame;
+  int type;
+  char *name = "";
+  char *submitter = "";
+  char *email = "";
+  int priority;
+  int start_frame;
+  int end_frame;
+
   while(1)
   {
-	  int command;
-	  jobnum_t jobnum;
-	  printf("1-->print all frames in a job");
-	  printf("2-->examine certain job");
-	  printf("3-->get a frame to render");
-	  printf("4-->add a job");
-	  printf("5-->delete a job");
-	  printf("6-->exit menu");
+    printf("1-->print all frames in a job");
+    printf("2-->examine certain job");
+    printf("3-->get a frame to render");
+    printf("4-->add a job");
+    printf("5-->delete a job");
+    printf("6-->print jobnums in queue");
+    printf("7-->exit menu");
 
-	  scanf("%d", &command);
+    scanf("%d", &command);
 
-	  if(command == 6)
-		  break;
+    if(command == 6)
+      break;
 
-	  switch(command)
-	  {
-	  case 1:
-		  printf("job number:");
-		  scanf("%d", &jobnum);
-		  printJob(distrenjob_get(&head, jobnum));
-		  break;
-	  case 2:
-
-		  break;
-	  case 3:
-		  break;
-	  case 4:
-		  break;
-	  case 5:
-		  break;
-	  }
+    switch(command)
+    {
+    case 1:
+      printf("job number:");
+      scanf("%d", &jobnum);
+      printJob(distrenjob_get(&head, jobnum));
+      break;
+    case 2:
+      printf("job number:");
+      scanf("%d", &jobnum);
+      printJobInfo(distrenjob_get(&head, jobnum));
+      break;
+    case 3:
+      find_jobframe(&head, &tmp_job, &tmp_frame);
+      printf("job#:%d", tmp_job->jobnum);
+      printf("frame#:%d", tmp_frame->num);
+      break;
+    case 4:
+      printf("type 1:blender, 2:povray"); scanf("%d", &type);
+      printf("name:");                    scanf("%s", name);
+      printf("submitter");                scanf("%s", submitter);
+      printf("e-mail");                   scanf("%s", email);
+      printf("priority");                 scanf("%d", &priority);
+      printf("start frame");              scanf("%d", &end_frame);
+      printf("end frame");                scanf("%d", &start_frame);
+      prepare_distrenjob(&head, type, name, submitter, email, priority, start_frame, end_frame);
+      break;
+    case 5:
+      distrenjob_remove(&head, distrenjob_get(&head, jobnum));
+      break;
+    case 6:
+      break;
+    }
   }
 
   distrend_listen(&listenset, config);