DistRen Changeset - 484da6c30b71 · protofusion repositories

Changeset - 484da6c30b71

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-10-01 16:07:34

Fixed errors in LordOfWar's commit, formatted, fixed logic problems

1 file changed with 27 insertions and 32 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -506,32 +506,25 @@ void printAllJobnums(struct distrenjob * @@
 int main(int argc, char *argv[])
+{
   /* Argument-parser */
   int counter = 0;
   int test = 0; // Have some fun if-ness that does fun stuff when this is 1
   int die = 0;
   for(counter=0; counter<argc; counter++){
          if(strcmp(argv[counter], "-h") == 0) {
            fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
            return 2;
+          }
           else if(strcmp(argv[counter], "-t") == 0) {
             fprintf(stderr, "Entering into test mode...\n\n");
             test=1;
+          }
           else{
             fprintf(stderr, "Please enter some compatible args (see -h), or invoke with no args.\n\n");
             die=1;
+          }
+  }
   if(die==1){
     return 3;
+  }
   struct distrenjob head;
   head.priority = 0; // make head have the highest priority
   int cont;
   struct distrend_listenset *listenset;
@@ @@ -560,64 +553,66 @@ int main(int argc, char *argv[]) @@
   char *submitter = "";
   char *email = "";
   int priority;
   int start_frame;
   int end_frame;
   while(1)
+  while(test == 1)
+  {
     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");
     fprintf(stderr, "\x1b[2J\x1b[H"); // Clear screen, regardless of mode
     fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
     fprintf(stderr, "\t1 \tPrint all frames in a job\n");
     fprintf(stderr, "\t2 \tExamine certain job\n");
     fprintf(stderr, "\t3 \tGet a frame to render\n");
     fprintf(stderr, "\t4 \tAdd a job\n");
     fprintf(stderr, "\t5 \tDelete a job\n");
     fprintf(stderr, "\t6 \tPrint jobnums in queue\n");
     fprintf(stderr, "\t7 \tQuit\n");
     scanf("%d", &command);
     if(command == 7)
       break;
     switch(command)
+    {
     case 1:
-      printf("job number:");
+      printf("Job number: ");
       scanf("%d", &jobnum);
       printJob(distrenjob_get(&head, jobnum));
       break;
     case 2:
-      printf("job number:");
+      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);
       printf("\nJob#:%d", tmp_job->jobnum);
       printf("\nFrame#:%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);
       printf("\nType: \n\t 1 \t blender\n\t 2 \t povray\n"); scanf("%d", &type);
       printf("\nName:");                    scanf("%s", name);
       printf("\nSubmitter");                scanf("%s", submitter);
       printf("\nEmail");                   scanf("%s", email);
       printf("\nPriority");                 scanf("%d", &priority);
       printf("\nStart frame");              scanf("%d", &end_frame);
       printf("\nEnd frame");                scanf("%d", &start_frame);
       prepare_distrenjob(&head, type, name, submitter, email, priority, start_frame, end_frame);
       break;
     case 5:
-      printf("job number:");
+      printf("\nJob number: ");
       scanf("%d", &jobnum);
       distrenjob_remove(&head, distrenjob_get(&head, jobnum));
       break;
     case 6:
       printAllJobnums(&head);
       break;
     case 7:
       fprintf(stderr,"Goodbye.\n");
       return 0;
     default:
-      printf("invalid input");
+      printf("Invalid input, please try again.\n");
+    }
+  }
   distrend_listen(&listenset, config);
   /* This is called the "main loop" */
   while(cont)

0 comments (0 inline, 0 general)