Journal entries are now committed in the order in which they appear in the course description (the template). Misspelled 'macroes' have been corrected to 'macros' in template.h and all affected files.

1 files changed, 5 insertions, 5 deletions

diff --git a/server/src/templateparser.cc b/server/src/templateparser.cc
index 140051e..d40bc1e 100644
--- a/server/src/templateparser.cc
+++ b/server/src/templateparser.cc
@@ -123,8 +123,8 @@ void TemplateParser::startTag(std::string name, std::map< std::string, std::stri
     
     Macro m;
     m.attributes = attributes;
-    t->course.macroes.push_back(m);
-    current_macro = &(t->course.macroes.back());
+    t->course.macros.push_back(m);
+    current_macro = &(t->course.macros.back());
 
     return;
   }
@@ -194,10 +194,10 @@ int main()
   printf("\t[Course]:\n");
   print_attributes("\t\t-", t->course.attributes);
   
-  printf("\t\t[Macroes]:\n");
-  std::vector< Macro >::iterator i = t->course.macroes.begin();
+  printf("\t\t[Macros]:\n");
+  std::vector< Macro >::iterator i = t->course.macros.begin();
 
-  while(i != t->course.macroes.end()) {
+  while(i != t->course.macros.end()) {
     printf("\t\t\t[Macro]:\n");
     print_attributes("\t\t\t\t-", (*i).attributes);