--- loncom/homework/caparesponse/caparesponse.c	2005/02/15 22:15:05	1.17
+++ loncom/homework/caparesponse/caparesponse.c	2005/12/20 19:59:52	1.20
@@ -1,6 +1,6 @@
 /* The LearningOnline Network with CAPA 
  * CAPA wrapper code
- * $Id: caparesponse.c,v 1.17 2005/02/15 22:15:05 albertel Exp $
+ * $Id: caparesponse.c,v 1.20 2005/12/20 19:59:52 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;
@@ -131,7 +134,7 @@ int caparesponse_capa_check_answer(char
 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;
+  int     input_len,all_alphabet,idx,outcome=-1,result;
   double  n_part,scale=1.0,given,target;
   char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH],
     tmp_unit_str[ANSWER_STRING_LENG];
@@ -160,8 +163,10 @@ int caparesponse_get_real_response (char
     }
   }
   if( !all_alphabet ) {
-    tmp_unit_str[0]=NULL;
+    tmp_unit_str[0] = 0;
     outcome = split_num_unit(answer,&n_part,input,tmp_unit_str);
+  }
+  if( outcome > 0 ) {
     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);
@@ -185,3 +190,19 @@ lphabet, but no number */
   } 
   return result;
 }
+
+/* Testing harnass
+int main(void) {
+  int result=0;
+  char *reterror=NULL;
+  result= caparesponse_capa_check_answer("10^3","1000",
+					 ANSWER_IS_FORMULA,
+					 TOL_ABSOLUTE,1E-3,
+					 3,5,NULL,NULL,
+					 CALC_UNFORMATED,
+					 "","4",
+					 "rndseed",
+					 &reterror);
+  fprintf(stderr,"result %d\nreterror: %s\n",result,reterror);
+}
+*/