--- capa/capa51/pProj/capaCommon.c	2000/09/14 20:20:45	1.16
+++ capa/capa51/pProj/capaCommon.c	2002/09/20 21:27:49	1.22
@@ -1449,10 +1449,14 @@ void capa_get_due_date(char *date_str,T_
   if ((duration > 0) && (student_number!=NULL)) {
     if (capa_get_login_time(student_number,set,&logintime)==1) {
       duetime=logintime+duration;
-      due_time_tm=localtime(&duetime);
-      sprintf(date_str,"%04d/%02d/%02d %02d:%02d",((due_time_tm->tm_year)+1900),
-	      due_time_tm->tm_mon+1,due_time_tm->tm_mday,due_time_tm->tm_hour,
-	      due_time_tm->tm_min);
+      if (compare_datetime(duetime,current->due_date)==-1) {
+	due_time_tm=localtime(&duetime);
+	sprintf(date_str,"%04d/%02d/%02d %02d:%02d",((due_time_tm->tm_year)+1900),
+		due_time_tm->tm_mon+1,due_time_tm->tm_mday,due_time_tm->tm_hour,
+		due_time_tm->tm_min);
+      } else {
+	strncpy(date_str,current->due_date,DATE_BUFFER); 
+      }
       return;
     }
   } 
@@ -2495,7 +2499,7 @@ char *buf;double *num; char *num_p; char
     while( isspace(buf[idx]) ) { idx++; }
     sscanf(num_str, "%lg", &result);  /* put the numerical value into a double variable */
     errcode = errcode | 1;
-  } else if( buf[idx] == 'x' || buf[idx] == 'X') { /* optional x or X part */
+  } else if( buf[idx] == 'x' || buf[idx] == 'X' || buf[idx] == '*') { /* optional x or X part */
     idx++; /* skip x or X */
     while( isspace(buf[idx]) ) { idx++; }
     
@@ -2917,7 +2921,7 @@ capa_check_ans(ai,ans, error) AnswerInfo
   int      sig, corr_len;
   int      choice[ANSWER_STRING_LENG];
   char     num_str[ANSWER_STRING_LENG], unit_str[ANSWER_STRING_LENG];
-  char     fmted[ANSWER_STRING_LENG], correct[ANSWER_STRING_LENG], answer[ANSWER_STRING_LENG];
+  char     fmted[ANSWER_STRING_LENG], correctans[ANSWER_STRING_LENG], answer[ANSWER_STRING_LENG];
   double   n_part;
   double   given, target, ratio, fmted_target, target_u, target_l, scale=1.0;
   double   delta;
@@ -3016,14 +3020,18 @@ capa_check_ans(ai,ans, error) AnswerInfo
           {
             corr_len = strlen(s); input_len = strlen(ans);
             if( corr_len == input_len ) {
-              for(idx=0;idx<ANSWER_STRING_LENG;idx++) choice[idx] = 0;
+              for(idx=0;idx<ANSWER_STRING_LENG;idx++) {
+		choice[idx] = 0;correctans[idx] = 0;
+	      }
               result = EXACT_ANS;
               for(ii=0;ii<corr_len; ii++) {
-                idx = toupper(correct[ii]) - 'A'; choice[idx] =  1;
+                idx = toupper(s[ii]) - 'A'; choice[idx] =  1;
               }
               for(ii=0;ii<input_len;ii++) {
-                idx = toupper(answer[ii]) - 'A';
-                if(choice[idx] != 1 )  result = INCORRECT;
+                idx = toupper(ans[ii]) - 'A'; correctans[idx] = 1;
+	      }
+	      for(ii=0;ii<ANSWER_STRING_LENG;ii++) {
+		if(choice[ii] != correctans[ii] )  result = INCORRECT;
               }
             } else { result = INCORRECT; }
             break;
@@ -3073,7 +3081,8 @@ capa_check_answer(p, answer, error) Prob
   int     sig_l; 
   int     sig_u;
   char   *fmt;
-  int     choice[ANSWER_STRING_LENG], ii, idx, corr_len, input_len;
+  int     choice[ANSWER_STRING_LENG], correctans[ANSWER_STRING_LENG];
+  int     ii, idx, corr_len, input_len;
   int     result = INCORRECT, sig, outcome, all_alphabet;
   char    fmted[FORMAT_STRING_LENG];
   double  given, target, ratio, fmted_target, target_u, target_l, scale=1.0;
@@ -3177,13 +3186,18 @@ capa_check_answer(p, answer, error) Prob
           {
             corr_len = strlen(correct); input_len = strlen(answer);
             if( corr_len == input_len ) {
-              for(ii=0;ii<ANSWER_STRING_LENG;ii++) choice[ii] = 0;  result = EXACT_ANS;
+              for(idx=0;idx<ANSWER_STRING_LENG;idx++) {
+		choice[idx] = 0;correctans[idx] = 0;
+	      }
+              result = EXACT_ANS;
               for(ii=0;ii<corr_len; ii++) {
                 idx = toupper(correct[ii]) - 'A'; choice[idx] =  1;
               }
               for(ii=0;ii<input_len;ii++) {
-                idx = toupper(answer[ii]) - 'A';
-                if(choice[idx] != 1 )  result = INCORRECT;
+                idx = toupper(answer[ii]) - 'A'; correctans[idx] = 1;
+	      }
+	      for(ii=0;ii<ANSWER_STRING_LENG;ii++) {
+		if(choice[ii] != correctans[ii] )  result = INCORRECT;
               }
             } else { result = INCORRECT; }
             break;
@@ -3248,7 +3262,7 @@ char *fml_str;char *input_str;char *var_
         }
       } else {
         diff = abs(1.0 - formula_val) * 100.0 ;
-        if( diff < tol ) {
+        if( diff > tol ) {
           outcome = INCORRECT;
         }
       }
@@ -3374,13 +3388,13 @@ Problem_t *p; char **answers; int cnt; c
     for(ii=0;ii<cnt;ii++) outcomes[ii]=0;  /* initialize the outcomes array */
     outcomes[0] = capa_check_answer(p, answers[0], &errormsg[0]);
 #ifdef    COMMON_DBUG
-    fprintf(dfp,"CAPA_CHECK_ANSWER(%s,%s):: outcome[0]=%d\n", 
-       p->answer,answers[0],outcomes[0]); fflush(dfp);
+    printf("CAPA_CHECK_ANSWER(%s,%s):: outcome[0]=%d\n", 
+       p->answer,answers[0],outcomes[0]); 
 #endif
     for(ii=1, ai = p->ans_list; ai; ii++,ai = ai->ans_next  ) {
        outcomes[ii] =  capa_check_ans(ai,answers[ii],&(errormsg[ii]));
 #ifdef    COMMON_DBUG
-    fprintf(dfp,"CAPA_CHECK_ANS(%s,%s): outcome[%d]=%d\n", ai->ans_str,answers[ii],ii,outcomes[ii]); fflush(dfp);
+    printf("CAPA_CHECK_ANS(%s,%s): outcome[%d]=%d\n", ai->ans_str,answers[ii],ii,outcomes[ii]); 
 #endif
     }
     done = ii = 0;
@@ -3552,7 +3566,7 @@ char *key_word;char *value;
 	  }
 	}
 	if (c=='\n') found=1;
-	if (((char)c)==((char)EOF)) break;
+	if (((char)c)==((char)EOF)) {failed=1;break;}
       }
     }
   } while (!done && !failed);