Final changes

Author: tyler-boyd

data/SCHS21-1.csv

@@ -2,26 +2,26 @@
 
 #include <string.h>
 #include <stdio.h>
- 
+
 int     opterr = 1,             /* if error message should be printed */
         optind = 1,             /* index into parent argv vector */
         optopt,                 /* character checked for validity */
         optreset;               /* reset getopt */
 char    *optarg;                /* argument associated with option */
- 
+
 #define BADCH   (int)'?'
 #define BADARG  (int)':'
 #define EMSG    ""
- 
+
 /*
  * getopt --
  *      Parse argc/argv argument vector.
  */
-int getopt(int nargc, char * const nargv[], const char *ostr)
+int getopt(int nargc, char * const *nargv, const char *ostr)
 {
   static char *place = EMSG;              /* option letter processing */
   const char *oli;                              /* option letter list index */
- 
+
   if (optreset || !*place) {              /* update scanning pointer */
     optreset = 0;
     if (optind >= nargc || *(place = nargv[optind]) != '-') {
@@ -70,4 +70,4 @@ int getopt(int nargc, char * const nargv[], const char *ostr)
     ++optind;
   }
   return (optopt);                        /* dump back option letter */
-}
+}

data/output.csv

@@ -3,18 +3,25 @@
 bool HarrizCSV::read(const char* lpFn)
 {
   strcpy(_file_path, lpFn);
-  cout << "Reading file (harriz): \"" << _file_path << "\"" << endl; 
+  cout << "Reading file (harriz): \"" << _file_path << "\"" << endl;
   ifstream file;
   file.open(_file_path);
   char line_buffer[MAX_ROW_LENGTH] = "";
 
+  if(!file.good() || file.eof()){
+    cout <<"BAD FILE!!!!!!" << endl;
+    return false;
+  }
+  else
+    cout << "Good file." << endl;
+
   file.getline(line_buffer, MAX_ROW_LENGTH);
 
   bool start_reading = false;
 
   while(!file.eof() && file.good())
   {
-    if(strcmp(line_buffer, "Type") >= 4 && start_reading == false)
+    if(strncmp(line_buffer, "Type", 4) == 0 && start_reading == false)
     {
       // Initialize headers and tell to start reading
       char* pch = strtok(line_buffer, ";");
@@ -53,4 +60,4 @@ bool HarrizCSV::read(const char* lpFn)
 vector<char*> *HarrizCSV::headers()
 {
   return &_headers;
-}
+}

include/resource.h

@@ -1,23 +1,26 @@
 #include "../include/harrizcsv.h"
 #include "../include/mark.h"
 #include "../include/student.h"
-#include "../include/resource.h"
+#include <unistd.h>
 
 using namespace std;
 
 int main(int argc, char **argv)
 {
+  cout << getcwd(0,0) << endl;
   char *lpFn = new char[1024];
   char *only = new char[256];
   char *exclude = new char[256];
   char *outputFn = new char[1024];
 
   strcpy(lpFn, "data/SCHS21-1.csv");
   strcpy(outputFn, "data/output.csv");
+  strcpy(only, "");
+  strcpy(exclude, "");
 
   int n_terms = 0;
   char c;
-  while((c = getopt(argc, argv, ":f:n:e:i")) != -1)
+  while((c = getopt(argc, argv, ":f:n:e:i:o")) != -1)
   {
     switch(c)
     {
@@ -33,6 +36,9 @@ int main(int argc, char **argv)
       case 'i':
         strncpy(only, optarg, 256);
         break;
+      case 'o':
+        strncpy(outputFn, optarg, 256);
+        break;
       case '?':
         if(optopt == 'f' || optopt == 'n' || optopt == 'e' || optopt == 'i')
           fprintf(stderr, "Option -%c requires an argument.\n", optopt);
@@ -70,7 +76,7 @@ int main(int argc, char **argv)
     strcpy(new_student->a, columns->at(1));
     for(int col = 2; col < columns->size(); col++)
     {
-      if(strcmp(headers->at(col), "O.A") == 0)
+      if(strncmp(headers->at(col), "O.A", 3) == 0)
       {
         new_student->OAs.push_back(Mark(columns->at(col)));
       }
@@ -154,8 +160,13 @@ int main(int argc, char **argv)
         outfile << student->OAs.at(iterm).to_int() << ";";
       for(int isum = 0; isum < n_summatives; isum++)
         outfile << student->Summatives.at(isum).to_int() << ";";
-      for(int iex = 0; iex < n_exams; iex++)
-        outfile << student->Exams.at(iex).to_int() << ";";
+      for(int iex = 0; iex < n_exams; iex++) {
+        int exmark = student->Exams.at(iex).to_int();
+        if(exmark == -1000000)
+          outfile << "A" << ";";
+        else
+          outfile << exmark << ";";
+      }
       outfile << ";;" << student->term_mark(n_terms).to_int() << ";";
       outfile << student->final_mark(n_terms).to_int();
       outfile << endl;
@@ -182,8 +193,13 @@ int main(int argc, char **argv)
         outfile << student->OAs.at(iterm).to_int() << ";";
       for(int isum = 0; isum < n_summatives; isum++)
         outfile << student->Summatives.at(isum).to_int() << ";";
-      for(int iex = 0; iex < n_exams; iex++)
-        outfile << student->Exams.at(iex).to_int() << ";";
+      for(int iex = 0; iex < n_exams; iex++) {
+        int exmark = student->Exams.at(iex).to_int();
+        if(exmark == -1000000)
+          outfile << "A" << ";";
+        else
+          outfile << exmark << ";";
+      }
       outfile << ";;" << student->term_mark(n_terms).to_int() << ";";
       outfile << student->final_mark(n_terms).to_int();
       outfile << endl;
@@ -193,4 +209,4 @@ int main(int argc, char **argv)
   outfile.close();
 
   return 0;
-}
+}

mark

@@ -2,6 +2,14 @@
 
 int str_to_int(char* str)
 {
+  if(str[0] == '-'){
+    strcpy(str, str+1);
+    strcat(str, "-");
+  }
+  if(str[0] == '+'){
+    strcpy(str, str+1);
+    strcat(str, "+");
+  }
   switch(str[0])
   {
     case 'R':