summaryrefslogtreecommitdiff
path: root/server/src/macro_parser.cc
diff options
context:
space:
mode:
authordeva <deva>2008-03-19 10:52:11 +0000
committerdeva <deva>2008-03-19 10:52:11 +0000
commit30d9bae5f4c35c23f85b4468cc89f9cd0dafc497 (patch)
treeea04f6d71f5f9739f15554d8984a3b4c24db0649 /server/src/macro_parser.cc
parent8fd8b50d51b234011f00bab7b46cf56cfd760f99 (diff)
Merge with local code.
Diffstat (limited to 'server/src/macro_parser.cc')
-rw-r--r--server/src/macro_parser.cc26
1 files changed, 14 insertions, 12 deletions
diff --git a/server/src/macro_parser.cc b/server/src/macro_parser.cc
index 62c74ca..9161613 100644
--- a/server/src/macro_parser.cc
+++ b/server/src/macro_parser.cc
@@ -70,13 +70,6 @@ static void start_hndl(void *p, const char *el, const char **attr)
// Do something reasonable with them...
- if(name == "macro") {
- // printf("Macro %s %s\n", attributes["name"].c_str(), attributes["resume"].c_str());
- parser->macro->name = attributes["name"];
- parser->macro->format = attributes["resume"];
- // return;
- }
-
if(name == "include") {
Macro inc;
@@ -91,6 +84,15 @@ static void start_hndl(void *p, const char *el, const char **attr)
return; // Don't do further parsing of this tag.
}
+ if(name == "macro") {
+
+ parser->macro->name = attributes["name"];
+ parser->macro->version = attributes["version"];
+ parser->macro->format = attributes["resume"];
+
+ return; // Don't do further parsing of this tag.
+ }
+
Widget widget;
widget.type = name;
@@ -107,11 +109,11 @@ static void start_hndl(void *p, const char *el, const char **attr)
std::map< std::string, std::string >::iterator i = attributes.begin();
while(i != attributes.end()) {
- WidgetProperty prop;
- prop.name = i->first;
- prop.value = i->second;
-
- wp->properties.push_back(prop);
+ // WidgetProperty prop;
+ // prop.name = i->first;
+ // prop.value = i->second;
+ // wp->properties.push_back(prop);
+ wp->properties[i->first] = i->second;
i++;
}