Diff for /loncom/homework/CAPA-converter/convert.c between versions 1.2 and 1.4

version 1.2, 2001/05/02 21:47:51 version 1.4, 2001/12/04 15:17:57
Line 1 Line 1
   /* The LearningOnline Network with CAPA
    * Main convert code, option parsing and startup 
    * $Id$
    *
    * Copyright Michigan State University Board of Trustees
    *
    * This file is part of the LearningOnline Network with CAPA (LON-CAPA).
    *
    * LON-CAPA is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License as published by
    * the Free Software Foundation; either version 2 of the License, or
    * (at your option) any later version.
    *
    * LON-CAPA is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    * GNU General Public License for more details.
    *
    * You should have received a copy of the GNU General Public License
    * along with LON-CAPA; if not, write to the Free Software
    * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    *
    * /home/httpd/html/adm/gpl.txt
    *
    * http://www.lon-capa.org/
    */
   
 /* ======================================================================== */  /* ======================================================================== */
 /*       Feb. 10 1997   Isaac Tsai                                          */  /*       Feb. 10 1997   Isaac Tsai                                          */
 /* ======================================================================== */  /* ======================================================================== */
Line 10 Line 37
 #include <time.h>  #include <time.h>
 #include <math.h>  #include <math.h>
 #include <string.h>  #include <string.h>
   #include <unistd.h>
   
   extern char *optarg;
   extern int optind, opterr, optout;
   
 #define   YES    1  #define   YES    1
   
 #include "capaCommon.h"  #include "capaCommon.h"
   
 char    *progname;  char    *progname;
   char *import_prefix="/res/capa";
   
 void  void
 print_answer(FILE *o_fp,int ans_cnt,char *ans,char *lower,char *upper,char *unit)  print_answer(FILE *o_fp,int ans_cnt,char *ans,char *lower,char *upper,char *unit)
Line 35  void print_question (FILE *o_fp,char *qu Line 65  void print_question (FILE *o_fp,char *qu
   fprintf(o_fp,"BQES:\n%s\nEQES:\n",question);    fprintf(o_fp,"BQES:\n%s\nEQES:\n",question);
 }  }
   
 int main (int argc, char  **argv)   int get_options ( int argc, char **argv, char ** filename)
   {
     int opt;
     /*opterr=0;*/
     while ((opt=getopt(argc,argv,"i:f:"))!=-1) {
       switch (opt) {
       case 'i': 
         import_prefix=optarg;
         break;
       case 'f': 
         *filename=optarg;
         break;
       case '?':
         return -1;
         break;
       }
     }
     return 0;
   }
   
   int main (int argc, char **argv) 
 {  {
   extern  int        Parsemode_f;    extern  int        Parsemode_f;
   extern  int        managermode;  
   
   Problem_t  *first_prob,*p;    /* unused  
   int         q_cnt, num_answers, result, setIdx = 1, q_idx;    extern  int        managermode;
     int         num_answers, q_idx;
   char        lower[ANSWER_STRING_LENG], upper[ANSWER_STRING_LENG];    char        lower[ANSWER_STRING_LENG], upper[ANSWER_STRING_LENG];
   int         StartSet = 1, EndSet = 1;    int         StartSet = 1, EndSet = 1;
   char        tmp_str[ANSWER_STRING_LENG];    char        tmp_str[ANSWER_STRING_LENG];
   double      tmp_ans;    double      tmp_ans;
   T_student   a_student;    T_student   a_student;
     Problem_t  *p;
     */
     Problem_t  *first_prob;
     int result, setIdx = 1, q_cnt;
     char *      filename=NULL;
   
   Parsemode_f=ASCII_MODE;    Parsemode_f=ASCII_MODE;
   if ( argc > 3 || argc < 2 ) {    
     printf("USAGE: %s filename\n",    if ( get_options(argc,argv,&filename) == -1 || filename==NULL ) {
    argv[0]);      printf("USAGE: %s [-i prefix] -f filename\n",argv[0]);
     exit(-1);      exit(-1);
   }    }
     
   result = capa_parse(setIdx, &first_prob, argv[1] ,&q_cnt,NULL);    result = capa_parse(setIdx, &first_prob, filename ,&q_cnt,NULL);
   
   return (0);    return (0);
 }  }

Removed from v.1.2  
changed lines
  Added in v.1.4


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