diff options
| -rw-r--r-- | server/TODO | 2 | ||||
| -rw-r--r-- | server/etc/pracrod.conf | 2 | ||||
| -rw-r--r-- | server/src/macro_parser.cc | 2 | ||||
| -rw-r--r-- | server/src/resumeparser.cc | 2 | ||||
| -rw-r--r-- | server/src/server.cc | 2 | ||||
| -rw-r--r-- | server/xml/example.xml | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/server/TODO b/server/TODO new file mode 100644 index 0000000..a8e84f6 --- /dev/null +++ b/server/TODO @@ -0,0 +1,2 @@ +Things to think about: + - What to do with resumes in included macroes. Append/prepend to main resume? diff --git a/server/etc/pracrod.conf b/server/etc/pracrod.conf index c29eb1d..6d97619 100644 --- a/server/etc/pracrod.conf +++ b/server/etc/pracrod.conf @@ -1,4 +1,4 @@ port = 12345; journal_commit_addr = "localhost"; -journal_commit_port = 4321; +journal_commit_port = 18112; diff --git a/server/src/macro_parser.cc b/server/src/macro_parser.cc index 7fc9609..62c74ca 100644 --- a/server/src/macro_parser.cc +++ b/server/src/macro_parser.cc @@ -71,7 +71,7 @@ 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()); + // printf("Macro %s %s\n", attributes["name"].c_str(), attributes["resume"].c_str()); parser->macro->name = attributes["name"]; parser->macro->format = attributes["resume"]; // return; diff --git a/server/src/resumeparser.cc b/server/src/resumeparser.cc index 769bb25..5826c70 100644 --- a/server/src/resumeparser.cc +++ b/server/src/resumeparser.cc @@ -53,7 +53,7 @@ std::string resume_parser(const char *format, Commit &commit) p++; } // p++; - printf("[%s]\n", var.c_str()); + //printf("[%s]\n", var.c_str()); // resume += "var(" + var + ")"; resume += commit.fields[var]; break; diff --git a/server/src/server.cc b/server/src/server.cc index 756539f..c88de4d 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -125,6 +125,8 @@ static void connection(TCPSocket &socket) journal_commit_addr.c_str(), journal_commit_port, resume.c_str(), resume.length()); + // printf(resume.c_str()); + i++; } } diff --git a/server/xml/example.xml b/server/xml/example.xml index 57f9587..3273d71 100644 --- a/server/xml/example.xml +++ b/server/xml/example.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <macro name="example" version="1.0" - resume="Det koster 50$$\nLinse: ${linse}D\n${linse_note}\nHævelse: ${radio}\n\n${spl_note}"> + resume="Det koster 50$$\\100kr\nLinse: ${linse1}\n${linse_note}\nHævelse: ${radio}\n\n${spl_note}"> <window name="mainwindow" caption="Fundus" width="500" |