···

       
71
       
71
       
 
       


     

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

     

       
73
       
73
       
 
       


     

       
74
       
74
       
-
       
         if (input == normalizedBook) {

     

       
74
       
74
       
+
       
         // second check is for the book of psalms

     

       
75
       
75
       
+
       
         if (input == normalizedBook || input == (normalizedBook + "S")) {

     

       
75
       
76
       
 
       
            foundBook = true;

     

       
76
       
77
       
 
       


     

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

     
···

       
80
       
81
       
 
       
      } else {

     

       
81
       
82
       
 
       
         if (!foundChapter) {

     

       
82
       
83
       
 
       
            OT >> input;

     

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

     

       
84
       
84
       
+
       
            if (input != "CHAPTER" && input != "PSALM") {

     

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

     

       
85
       
86
       
 
       


     

       
86
       
87
       
 
       
               continue;

     

       
87
       
88
       
 
       
            }

     

       
89
       
89
       
+
       


     

       
88
       
90
       
 
       
            OT >> input;

     

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

     

       
90
       
92
       
 
       
               foundChapter = true;

     
···

       
93
       
95
       
 
       
         } else {

     

       
94
       
96
       
 
       
            OT >> input;

     

       
95
       
97
       
 
       


     

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

     

       
98
       
98
       
+
       
            if (input == "CHAPTER" || input == "PSALM") break;

     

       
97
       
99
       
 
       


     

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

     

       
99
       
101
       
 
       
               foundVerse = true;

     
···

       
120
       
122
       
 
       
      OF.close();

     

       
121
       
123
       
 
       
   } else {

     

       
122
       
124
       
 
       
      if (!foundBook) {

     

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

     

       
125
       
125
       
+
       
         cout << (normalizedBook == "PSALM" ? book += "s" : book) << " does not exist in the Old Testament";

     

       
124
       
126
       
 
       
      } else {

     

       
125
       
127
       
 
       
         if (!foundChapter) {

     

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

     

       
128
       
128
       
+
       
            cout << (normalizedBook == "PSALM" ? "Psalm " : "Chapter ") << chapter;

     

       
129
       
129
       
+
       
            cout << " does not exist in " << (normalizedBook == "PSALM" ? book += "s" : book);

     

       
127
       
130
       
 
       
         } else if (!foundVerse) {

     

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

     

       
129
       
132
       
 
       
         }

     

···

       
203
       
203
       
 
       
print_section "Valid Verse Tests"

     

       
204
       
204
       
 
       


     

       
205
       
205
       
 
       
run_verse_test "Exodus 20:3" "Exodus" "20" "3" "3 Thou shalt have no other gods before me" true

     

       
206
       
206
       
-
       
run_verse_test "Psalm 23:1" "Psalm" "23" "1" "1 The LORD is my shepherd; I shall not want" true

     

       
206
       
206
       
+
       
run_verse_test "Psalm 23:1" "Psalm" "23" "1" "1 The LORD [is] my shepherd; I shall not want." true

     

       
207
       
207
       
 
       


     

       
208
       
208
       
 
       
# Error Case Tests

     

       
209
       
209
       
 
       
print_section "Error Case Tests"