Diff for /capa/capa51/pProj/capaCgiUtils.c between versions 1.20 and 1.22

version 1.20, 2000/08/07 20:47:29 version 1.22, 2010/05/11 00:42:42
Line 146  CAPA_ARG((char *s,char c)) Line 146  CAPA_ARG((char *s,char c))
     return -1;      return -1;
 }  }
   
 int getline  int capa_getline
 CAPA_ARG((char *s,int n,FILE *f))   CAPA_ARG((char *s,int n,FILE *f)) 
 {  {
     register int i=0;      register int i=0;
Line 403  char *log_string; Line 403  char *log_string;
    tmtime=localtime(&t);     tmtime=localtime(&t);
    strftime(timeStr,FILE_NAME_LENGTH,"%d/%m %X",tmtime);     strftime(timeStr,FILE_NAME_LENGTH,"%d/%m %X",tmtime);
    /*ct[ strlen(ct)-1 ]=0;*/ /* Trash newline */     /*ct[ strlen(ct)-1 ]=0;*/ /* Trash newline */
    protect_log_string(log_string);     /*protect_log_string(log_string);*/ /* done on indiviual answers now*/
    fprintf(fp,"%s\t%s\t%s\n",student_number,timeStr,log_string); fflush(fp);     fprintf(fp,"%s\t%s\t%s\n",student_number,timeStr,log_string); fflush(fp);
    fclose(fp);     fclose(fp);
    return (0);     return (0);
Line 413  char *log_string; Line 413  char *log_string;
 void w_get_responses(int x,int q_idx,char* submissions_str)  void w_get_responses(int x,int q_idx,char* submissions_str)
 {  {
   int leng, sub_idx;    int leng, sub_idx;
   char buf[MAX_BUFFER_SIZE];    char buf[MAX_BUFFER_SIZE],*tmp;
   if( !strncmp(g_entries[x].name,"INPUT",5) ) {    if( !strncmp(g_entries[x].name,"INPUT",5) ) {
     if( index(g_entries[x].name, ',' ) == NULL ) {  /* only one answer */      if( index(g_entries[x].name, ',' ) == NULL ) {  /* only one answer */
       sscanf(g_entries[x].name,"INPUT%d",&q_idx);        sscanf(g_entries[x].name,"INPUT%d",&q_idx);
Line 427  void w_get_responses(int x,int q_idx,cha Line 427  void w_get_responses(int x,int q_idx,cha
  }   }
  leng = strlen( g_entries[x].val );   leng = strlen( g_entries[x].val );
  if ( leng > 0 ) {   if ( leng > 0 ) {
   sprintf(buf,"%d\t%s\t",q_idx,g_entries[x].val);            tmp=strsave(g_entries[x].val);
     protect_log_string(tmp);
     sprintf(buf,"%d\t%s\t",q_idx,tmp);
     capa_mfree(tmp);
   strcat(submissions_str,buf);    strcat(submissions_str,buf);
  }   }
       }        }
Line 451  void w_get_responses(int x,int q_idx,cha Line 454  void w_get_responses(int x,int q_idx,cha
  }   }
  leng = strlen( g_entries[x].val );   leng = strlen( g_entries[x].val );
  if ( leng > 0 ) {   if ( leng > 0 ) {
   sprintf(buf,"%d\t%s\t",q_idx,g_entries[x].val);            tmp=strsave(g_entries[x].val);
     protect_log_string(tmp);
     sprintf(buf,"%d\t%s\t",q_idx,tmp);
     capa_mfree(tmp);
   strcat(submissions_str,buf);    strcat(submissions_str,buf);
  }   }
       }        }

Removed from v.1.20  
changed lines
  Added in v.1.22


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>