--- loncom/homework/caparesponse/caparesponse.c	2004/11/16 23:37:40	1.14
+++ loncom/homework/caparesponse/caparesponse.c	2005/11/07 23:37:39	1.18
@@ -1,6 +1,6 @@
 /* The LearningOnline Network with CAPA 
  * CAPA wrapper code
- * $Id: caparesponse.c,v 1.14 2004/11/16 23:37:40 albertel Exp $
+ * $Id: caparesponse.c,v 1.18 2005/11/07 23:37:39 albertel Exp $
  *
  * Copyright Michigan State University Board of Trustees
  *
@@ -34,7 +34,7 @@ PointsList_t * parse_pts_list (char *pts
   int done=0;
   /*fprintf(stderr,"ids %s\n",id_list);
     fprintf(stderr,"pts %s\n",pts_list);*/
-  while (!done) {
+  while (!done && pts_list) {
     int idx;
     /*fprintf(stderr,"pts; %s\n",idx_pts);*/
     new=gen_ptslist_str(idx_pts);
@@ -97,6 +97,9 @@ int caparesponse_capa_check_answer(char
   if (type == ANSWER_IS_FORMULA) {
     p.id_list=id_list;
     p.pts_list=parse_pts_list(pts_list);
+    if ( p.id_list == NULL || p.pts_list == NULL) {
+      return BAD_FORMULA;
+    }
   }
   p.ans_type   = type;
   p.answer     = correct;
@@ -110,7 +113,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;
@@ -130,7 +136,8 @@ int caparesponse_get_real_response (char
   //double caparesponse_get_real_response (char* unit_str, char* answer) {
   int     input_len,all_alphabet,idx,outcome,result;
   double  n_part,scale=1.0,given,target;
-  char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH];
+  char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH],
+    tmp_unit_str[ANSWER_STRING_LENG];
   Unit_t *ans_unit;
   long    seed1,seed2;
   FILE   *fp;
@@ -143,7 +150,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;
   }
@@ -155,10 +163,11 @@ int caparesponse_get_real_response (char
     }
   }
   if( !all_alphabet ) {
-    outcome = split_num_unit(answer,&n_part,input,unit_str);
+    tmp_unit_str[0]=NULL;
+    outcome = split_num_unit(answer,&n_part,input,tmp_unit_str);
     if( outcome > 1 ) { /* with both num and unit parts or only unit part */
       if( ans_unit != NULL ) {
-	result = check_correct_unit(unit_str,ans_unit,&scale);
+	result = check_correct_unit(tmp_unit_str,ans_unit,&scale);
       } else {
 	/* what to do when no unit is specified but student entered a unit? */
 	result = UNIT_NOTNEEDED;