--- capa/capa51/pProj/capaCommon.c 1999/12/01 18:22:00 1.3 +++ capa/capa51/pProj/capaCommon.c 2000/02/22 18:19:02 1.9 @@ -569,8 +569,8 @@ int set; } funlockstream(fp); fclose(fp); if(!found) { - ans_p = capa_malloc(nq+1,1); - tries_p = capa_malloc(3*nq+2,1); /* space and \0 */ + ans_p = capa_malloc(nq+2,1); + tries_p = capa_malloc(3*nq+3,1); /* space and \0 */ for(ii=0;iianswers = ans_p; entry->tries = tries_p; entry->e_probs = nq; @@ -2998,6 +3000,9 @@ capa_check_ans(ai,ans) AnswerInfo_t *ai result = check_formula_ans(s,ans,ai->ans_id_list,ai->ans_pts_list,tt,to); break; case ANSWER_IS_EXTERNAL: /* Not yet implemented */ + + + break; } return (result); @@ -3079,7 +3084,7 @@ capa_check_answer(p, answer) Problem_t * } given = n_part * scale; /* convert the given answer into proper scale for units */ sig = calc_sig( input ); - if( (sig < sig_l) || (sig > sig_u) ) { + if( ((sig < sig_l) || (sig > sig_u)) && (sig!=0)) { result = SIG_FAIL; } else { switch( tol_type ) { @@ -3151,6 +3156,11 @@ capa_check_answer(p, answer) Problem_t * result = check_formula_ans(correct,answer,p->id_list,p->pts_list,tol_type,tol); break; case ANSWER_IS_EXTERNAL: /* not yet implemented */ + /* we assume the external program is called through popen() */ + /* and the result will be given back as 0 or 1 to indicate the */ + /* given answer is correct or not */ + /* arguments are given to the program as */ + break; } @@ -3467,6 +3477,7 @@ char *key_word;char *value; fclose(fp); if (done) { + trim_response_ws(right); /*get rid of leading and trailing spaces*/ for(i=0,j=0;i<(strlen(right)+1);i++) { value[j]='\0'; if (right[i] == '\\' && (i < (strlen(right))) ) {