--- loncom/homework/caparesponse/caparesponse.c 2004/12/23 18:36:42 1.16 +++ loncom/homework/caparesponse/caparesponse.c 2005/02/15 22:15:05 1.17 @@ -1,6 +1,6 @@ /* The LearningOnline Network with CAPA * CAPA wrapper code - * $Id: caparesponse.c,v 1.16 2004/12/23 18:36:42 albertel Exp $ + * $Id: caparesponse.c,v 1.17 2005/02/15 22:15:05 albertel Exp $ * * Copyright Michigan State University Board of Trustees * @@ -110,7 +110,10 @@ int caparesponse_capa_check_answer(char } if (unit_str != NULL && unit_str[0]!='\0') { strncpy(p.unit_str,unit_str,ANSWER_STRING_LENG-1); - p.ans_unit = u_parse_unit(unit_str); + //p.ans_unit = u_parse_unit(unit_str); + p.ans_unit = parse_unit_expr(unit_str); + p.ans_unit = process_utree(p.ans_unit); + //print_unit_t(p.ans_unit); } else { p.unit_str[0]='\0'; p.ans_unit=NULL; @@ -144,7 +147,8 @@ int caparesponse_get_real_response (char fclose(fp); if (unit_str != NULL && unit_str[0]!='\0') { - ans_unit = u_parse_unit(unit_str); + ans_unit = parse_unit_expr(unit_str); + ans_unit = process_utree(ans_unit); } else { ans_unit=NULL; }