commit 532c6cfd362ad503d14eddad833e2f8e5fbe96ad · dunkirk.sh/gleam-bible-search

+1 -1

makefile

···

       7
       7
        
       	cd test && ./test.sh

     

       8
       8
        
       

     

       9
       9
        
       exec:

     

       10
       10
       -
       	./build/lab66

     

       10
       10
       +
       	./build/lab66 test/OT.txt

     

       11
       11
        
       

     

       12
       12
        
       run: lab66 exec

     

       13
       13

+92 -9

src/lab66.cpp

···

       16
       16
        
       int main(int argc, char **argv) {

     

       17
       17
        
       

     

       18
       18
        
          ifstream OT;

     

       19
       19
       -
          string filename = "../test/OT.txt";

     

       19
       19
       +
          ofstream OF;

     

       20
       20
       +
          string inputFilename = "../test/OT.txt";

     

       21
       21
       +
          string outputFilename = "build/verses.txt";

     

       22
       22
       +
       

     

       20
       23
        
          string book;

     

       24
       24
       +
          string normalizedBook;

     

       21
       25
        
          int chapter;

     

       22
       26
        
          int verse;

     

       23
       27
        
       

     

       24
       28
        
          // get path to OT.txt if provided otherwise use default path

     

       25
       25
       -
          if (argc == 2) {

     

       26
       26
       -
             filename = argv[1];

     

       27
       27
       -
          }

     

       29
       29
       +
          // and then do the same for the verses.txt

     

       30
       30
       +
          if (argc >= 2) inputFilename = argv[1];

     

       31
       31
       +
          if (argc >= 3) outputFilename = argv[2];

     

       28
       32
        
       

     

       29
       29
       -
          OT.open(filename);

     

       33
       33
       +
          OT.open(inputFilename);

     

       30
       34
        
       

     

       31
       35
        
          if (!OT.is_open()) {

     

       32
       32
       -
             cout << filename << ": failed to open file";

     

       36
       36
       +
             cout << inputFilename << ": failed to open file";

     

       33
       37
        
             return 1;

     

       34
       38
        
          }

     

       35
       39
        
       

     
···

       37
       41
        
       

     

       38
       42
        
          cout << "the book: ";

     

       39
       43
        
          getline(cin, book);

     

       40
       40
       -
          cout << endl;

     

       44
       44
       +
          for (int i = 0; i < book.length(); i++)

     

       45
       45
       +
               normalizedBook += toupper(book[i]);

     

       41
       46
        
       

     

       42
       47
        
          cout << "the chapter: ";

     

       43
       48
        
          cin >> chapter;

     

       44
       44
       -
          cout << endl;

     

       45
       49
        
       

     

       46
       50
        
          cout << "the verse: ";

     

       47
       51
        
          cin >> verse;

     

       52
       52
       +
       

     

       48
       53
        
          cout << endl;

     

       49
       54
        
       

     

       50
       50
       -
          cout << book << " " << chapter << ":" << verse;

     

       55
       55
       +
          bool foundBook = false;

     

       56
       56
       +
          bool foundChapter = false;

     

       57
       57
       +
          bool foundVerse = false;

     

       58
       58
       +
          string verseString;

     

       59
       59
       +
          while (!OT.eof()) {

     

       60
       60
       +
             string input;

     

       61
       61
       +
       

     

       62
       62
       +
             if (!foundBook) {

     

       63
       63
       +
                OT >> input; // THE

     

       64
       64
       +
                if (input != "THE") continue;

     

       65
       65
       +
                OT >> input; // BOOK

     

       66
       66
       +
                if (input != "BOOK") continue;

     

       67
       67
       +
                OT >> input; // OF

     

       68
       68
       +
                if (input != "OF") continue;

     

       69
       69
       +
       

     

       70
       70
       +
                OT.ignore(); // skip the single space

     

       71
       71
       +
       

     

       72
       72
       +
                getline(OT, input); // handle multi word books

     

       73
       73
       +
       

     

       74
       74
       +
                if (input == normalizedBook) {

     

       75
       75
       +
                   foundBook = true;

     

       76
       76
       +
       

     

       77
       77
       +
                   getline(OT, input); // discard empty line

     

       78
       78
       +
                   continue;

     

       79
       79
       +
                }

     

       80
       80
       +
             } else {

     

       81
       81
       +
                if (!foundChapter) {

     

       82
       82
       +
                   OT >> input;

     

       83
       83
       +
                   if (input != "CHAPTER") {

     

       84
       84
       +
                      if (input == "THE") break;

     

       85
       85
       +
       

     

       86
       86
       +
                      continue;

     

       87
       87
       +
                   }

     

       88
       88
       +
                   OT >> input;

     

       89
       89
       +
                   if (input == to_string(chapter)) {

     

       90
       90
       +
                      foundChapter = true;

     

       91
       91
       +
                      continue;

     

       92
       92
       +
                   }

     

       93
       93
       +
                } else {

     

       94
       94
       +
                   OT >> input;

     

       95
       95
       +
       

     

       96
       96
       +
                   if (input == "CHAPTER") break;

     

       97
       97
       +
       

     

       98
       98
       +
                   if (input == to_string(verse)) {

     

       99
       99
       +
                      foundVerse = true;

     

       100
       100
       +
                      OT.ignore(); // ignore space

     

       101
       101
       +
                      getline(OT, verseString);

     

       102
       102
       +
                      break;

     

       103
       103
       +
                   }

     

       104
       104
       +
                }

     

       105
       105
       +
             }

     

       106
       106
       +
          }

     

       107
       107
       +
       

     

       108
       108
       +
          if (foundVerse) {

     

       109
       109
       +
             cout << verse << " " << verseString << endl;

     

       110
       110
       +
       

     

       111
       111
       +
             OF.open(outputFilename);

     

       112
       112
       +
       

     

       113
       113
       +
             if (!OF.is_open()) {

     

       114
       114
       +
                cout << outputFilename << ": error saving file" << endl;

     

       115
       115
       +
                return 1;

     

       116
       116
       +
             }

     

       117
       117
       +
       

     

       118
       118
       +
             OF << verse << " " << verseString << endl;

     

       119
       119
       +
       

     

       120
       120
       +
             OF.close();

     

       121
       121
       +
          } else {

     

       122
       122
       +
             if (!foundBook) {

     

       123
       123
       +
                cout << book << " does not exist in the Old Testament";

     

       124
       124
       +
             } else {

     

       125
       125
       +
                if (!foundChapter) {

     

       126
       126
       +
                   cout << "Chapter " << chapter << " does not exist in " << book;

     

       127
       127
       +
                } else if (!foundVerse) {

     

       128
       128
       +
                   cout << "Verse " << verse << " does not exist in " << book << " " << chapter;

     

       129
       129
       +
                }

     

       130
       130
       +
             }

     

       131
       131
       +
       

     

       132
       132
       +
             cout << endl;

     

       133
       133
       +
          }

     

       51
       134
        
       

     

       52
       135
        
          OT.close();

     

       53
       136