--- capa/capa51/pProj/capaCommon.c 2000/08/22 13:19:56 1.15 +++ capa/capa51/pProj/capaCommon.c 2000/09/14 20:20:45 1.16 @@ -48,6 +48,8 @@ int yyparse(); extern FILE *yyin; extern void yyrestart(); +extern FILE *dfp; + /*----------------------------------------------------------*/ /* RETURN: -1 file error */ /* 0 success */ @@ -3200,6 +3202,10 @@ capa_check_answer(p, answer, error) Prob /* 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 */ + /* before running the program, check its existance first */ + /* should we specify a time out period in capa.config file? */ + /* set up a timer for this purpose */ + /* FILE *popen (const char *command,const char *type ); */ break; @@ -3207,7 +3213,7 @@ capa_check_answer(p, answer, error) Prob return (result); } -/* ----------------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ /* assumming the formula is *fml_str and the student input is *input_str */ /* according to the type of tolerance, we form the final formula as */ /* absolute tolerance: (*fml_str) - (*input_str) */ @@ -3367,8 +3373,15 @@ Problem_t *p; char **answers; int cnt; c outcomes = (int *)capa_malloc(sizeof(int),cnt); for(ii=0;iianswer,answers[0],outcomes[0]); fflush(dfp); +#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); +#endif } done = ii = 0; result = 0;