--- loncom/homework/caparesponse/caparesponse.c	2001/12/04 15:17:57	1.7
+++ loncom/homework/caparesponse/caparesponse.c	2004/03/12 21:06:19	1.12
@@ -1,6 +1,6 @@
 /* The LearningOnline Network with CAPA 
  * CAPA wrapper code
- * $Id: caparesponse.c,v 1.7 2001/12/04 15:17:57 albertel Exp $
+ * $Id: caparesponse.c,v 1.12 2004/03/12 21:06:19 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;
@@ -76,8 +76,7 @@ int caparesponse_capa_check_answer(char
   char *error=NULL,filename[FILE_NAME_LENGTH];
   FILE *fp;
 
-  /*fprintf(stderr,"hi in caparesponse\n");*/
-  /*need to initialize unit parser*/
+  /* need to initialize unit parser*/
   sprintf(filename,"/home/httpd/html/res/adm/includes/capa.units");
   if ((fp=fopen(filename,"r"))==NULL) {
     /* printf("Error: can't open %s\n",filename);*/
@@ -104,8 +103,11 @@ int caparesponse_capa_check_answer(char
   p.tolerance  = tolerance;
   p.sig_lbound = sig_lbound;
   p.sig_ubound = sig_ubound;
-  strncpy(p.ans_fmt,ans_fmt,ANSWER_STRING_LENG-1);
-  if (unit_str[0]!='\0') {
+  
+  if (ans_fmt != NULL ) {
+    strncpy(p.ans_fmt,ans_fmt,ANSWER_STRING_LENG-1);
+  }
+  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);
   } else {
@@ -114,10 +116,10 @@ int caparesponse_capa_check_answer(char
   }
   p.calc       = calc;
 
-
   result=capa_check_answer(&p,response,&error);
-
-  if (error!=NULL) {free(error);}
+  *reterror=error;
+  // Caller is expected to free reterror
+  //  if (error!=NULL) {free(error);}
 
   return result;
 }