--- loncom/homework/caparesponse/caparesponse.c	2003/07/01 21:10:43	1.10
+++ 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.10 2003/07/01 21:10:43 albertel Exp $
+ * $Id: caparesponse.c,v 1.18 2005/11/07 23:37:39 albertel Exp $
  *
  * Copyright Michigan State University Board of Trustees
  *
@@ -32,11 +32,11 @@ PointsList_t * parse_pts_list (char *pts
   PointsList_t *new=NULL, *end=NULL, *beforeend=NULL, *rlist=NULL;
   char *idx_pts=pts_list;
   int done=0;
-  /*fprintf(stderr,"ids %s\n",id_list);*/
-    fprintf(stderr,"pts %s\n",pts_list);
-  while (!done) {
+  /*fprintf(stderr,"ids %s\n",id_list);
+    fprintf(stderr,"pts %s\n",pts_list);*/
+  while (!done && pts_list) {
     int idx;
-      fprintf(stderr,"pts; %s\n",idx_pts);
+    /*fprintf(stderr,"pts; %s\n",idx_pts);*/
     new=gen_ptslist_str(idx_pts);
     if (!new) break;
     if (!rlist) { rlist=new; }
@@ -50,8 +50,8 @@ PointsList_t * parse_pts_list (char *pts
     while (end) {
       idx++;
       end->pts_idx=idx;
-        fprintf(stderr,"end is:%d:%d:%s:%d\n",idx,end->pts_idx,end->pts_str,
-	end->pts_next);
+      /*fprintf(stderr,"end is:%d:%d:%s:%d\n",idx,end->pts_idx,end->pts_str,
+	end->pts_next);*/
       beforeend=end;
       end=end->pts_next;
     }
@@ -68,73 +68,123 @@ int caparesponse_capa_check_answer(char
 				   int sig_lbound,int sig_ubound, 
 				   char *ans_fmt, char *unit_str,
 				   int calc, char *id_list, char *pts_list, 
-				   char *rndseed)
+				   char *rndseed, char** reterror)
 				   
 {
   long result,seed1,seed2;
   Problem_t p;
   char *error=NULL,filename[FILE_NAME_LENGTH];
   FILE *fp;
-fprintf(stderr,"1\n");
+
   /* need to initialize unit parser*/
+  *reterror=NULL;
   sprintf(filename,"/home/httpd/html/res/adm/includes/capa.units");
   if ((fp=fopen(filename,"r"))==NULL) {
     /* printf("Error: can't open %s\n",filename);*/
       return (-1); 
   }
-fprintf(stderr,"2\n");
   u_getunit(fp);
-fprintf(stderr,"3\n");
   fclose(fp);
-fprintf(stderr,"4\n");
   /* need to setup random generator (FIXME) should only do this if 
      it hasn't been yet*/
   phrtsd(rndseed,&seed1,&seed2);
   setall(seed1,seed2);
-fprintf(stderr,"5\n");
 
   /* assign_id_list and assign_pts_list exist in capaGrammerDef.y */
   p.id_list=NULL;
   p.pts_list=NULL;
-fprintf(stderr,"6 -%s-\n",id_list);
+
   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;
+    }
   }
-fprintf(stderr,"6\n");
   p.ans_type   = type;
   p.answer     = correct;
   p.tol_type   = tol_type;
   p.tolerance  = tolerance;
   p.sig_lbound = sig_lbound;
   p.sig_ubound = sig_ubound;
-fprintf(stderr,"7\n");
   
   if (ans_fmt != NULL ) {
-fprintf(stderr,"8\n");
     strncpy(p.ans_fmt,ans_fmt,ANSWER_STRING_LENG-1);
   }
-fprintf(stderr,"9\n");
   if (unit_str != NULL && unit_str[0]!='\0') {
-fprintf(stderr,"10\n");
     strncpy(p.unit_str,unit_str,ANSWER_STRING_LENG-1);
-fprintf(stderr,"11\n");
-    p.ans_unit   = u_parse_unit(unit_str);
-fprintf(stderr,"12\n");
+    //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 {
-fprintf(stderr,"13\n");
     p.unit_str[0]='\0';
-fprintf(stderr,"14\n");
     p.ans_unit=NULL;
-fprintf(stderr,"15\n");
   }
   p.calc       = calc;
 
-fprintf(stderr,"16 -p.asnwer %s- -response %s-\n",p.answer,response);
   result=capa_check_answer(&p,response,&error);
-fprintf(stderr,"17\n");
+  *reterror=error;
+  // Caller is expected to free reterror
+  //  if (error!=NULL) {free(error);}
 
-  if (error!=NULL) {free(error);}
+  return result;
+}
 
+int caparesponse_get_real_response (char* unit_str, char* answer,
+				    double* scaled) {
+  //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],
+    tmp_unit_str[ANSWER_STRING_LENG];
+  Unit_t *ans_unit;
+  long    seed1,seed2;
+  FILE   *fp;
+  sprintf(filename,"/home/httpd/html/res/adm/includes/capa.units");
+  if ((fp=fopen(filename,"r"))==NULL) {
+    /* printf("Error: can't open %s\n",filename);*/
+    return (-1); 
+  }
+  u_getunit(fp);
+  fclose(fp);
+
+  if (unit_str != NULL && unit_str[0]!='\0') {
+    ans_unit   = parse_unit_expr(unit_str);
+    ans_unit   = process_utree(ans_unit);
+  } else {
+    ans_unit=NULL;
+  }
+  input_len = strlen(answer);
+  all_alphabet = 1;
+  for(idx=0;idx<input_len;idx++) {
+    if( isdigit(answer[idx]) ) {
+      all_alphabet = 0;
+    }
+  }
+  if( !all_alphabet ) {
+    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(tmp_unit_str,ans_unit,&scale);
+      } else {
+	/* what to do when no unit is specified but student entered a unit? */
+	result = UNIT_NOTNEEDED;
+      }
+    } else {
+      if( ans_unit != NULL ) {
+	result = NO_UNIT;
+      }
+    }
+    if( (result != NO_UNIT) && (!check_for_unit_fail(result)) && ( result != UNIT_NOTNEEDED) ) {
+      given = n_part * scale;
+      *scaled=given;
+      /* convert the given answer into proper scale for units */
+    } /* end if unit check */
+  } else { /* user entered a
+lphabet, but no number */
+    result = WANTED_NUMERIC;
+  } 
   return result;
 }