--- loncom/homework/caparesponse/caparesponse.c	2003/05/27 17:01:36	1.9
+++ 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.9 2003/05/27 17:01:36 bowersj2 Exp $
+ * $Id: caparesponse.c,v 1.17 2005/02/15 22:15:05 albertel Exp $
  *
  * Copyright Michigan State University Board of Trustees
  *
@@ -68,7 +68,7 @@ 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;
@@ -77,6 +77,7 @@ int caparesponse_capa_check_answer(char
   FILE *fp;
 
   /* 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);*/
@@ -109,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;
@@ -117,8 +121,67 @@ int caparesponse_capa_check_answer(char
   p.calc       = calc;
 
   result=capa_check_answer(&p,response,&error);
+  *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;
 }