From 23f39df8b8edeacfa5821050abbdc855acb2edd6 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 1 Jul 2011 11:54:26 +0000
Subject: removed macrotool. add lua wrapper for praxisd. new type attributes_t
 for sax parser and children. make macros/templates use real vars instead of
 var map. add data ttl on macro level. add 'important' attribute to macrotags
 in templates.

---
 server/src/praxisd.cc | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

(limited to 'server/src/praxisd.cc')

diff --git a/server/src/praxisd.cc b/server/src/praxisd.cc
index 4a9c2f1..d814b54 100644
--- a/server/src/praxisd.cc
+++ b/server/src/praxisd.cc
@@ -246,7 +246,7 @@ public:
     }
   }
 
-  void endTag(std::string name)
+  void endTag(std::string)
   {
     str = NULL;
   }
@@ -304,7 +304,7 @@ class AdresseParser : public SAXParser {
 public:
   AdresseParser(std::vector<Praxisd::adresse_t> &al) : div(al) { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_adresse") {
@@ -340,7 +340,7 @@ public:
   BehandlingParser(std::vector<Praxisd::behandling_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_behandling") {
@@ -374,7 +374,7 @@ public:
   CaveParser(std::vector<Praxisd::cave_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_cave") {
@@ -407,7 +407,7 @@ public:
   DiagnoseParser(std::vector<Praxisd::diagnose_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_diagnose") {
@@ -440,7 +440,7 @@ public:
   FraseParser(std::vector<Praxisd::frase_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_frase") {
@@ -473,7 +473,7 @@ public:
   GrafikParser(std::vector<Praxisd::grafik_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_grafik") {
@@ -504,7 +504,7 @@ public:
   IndholdstofParser(std::vector<Praxisd::indholdstof_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_indholdstof") {
@@ -539,7 +539,7 @@ public:
   KlageParser(std::vector<Praxisd::klage_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_klage") {
@@ -572,7 +572,7 @@ public:
   OversigtParser(std::vector<Praxisd::oversigt_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_oversigt") {
@@ -604,7 +604,7 @@ public:
   PostnummerParser(std::vector<Praxisd::postnummer_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_postnummer") {
@@ -641,7 +641,7 @@ public:
   TypeParser(std::vector<Praxisd::type_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_type") {
@@ -675,7 +675,7 @@ public:
   UndersoegelseParser(std::vector<Praxisd::undersoegelse_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_undersoegelse") {
@@ -708,7 +708,7 @@ public:
   YdelseParser(std::vector<Praxisd::ydelse_t> &d) : div(d)
   { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "div_ydelse") {
@@ -745,7 +745,7 @@ class AftaleParser : public SAXParser {
 public:
   AftaleParser(std::vector<Praxisd::aftale_t> &a) : div(a) { str = NULL; }
   void characterData(std::string &data) { if(str) *str += data; }
-  void endTag(std::string name) { str = NULL; }
+  void endTag(std::string) { str = NULL; }
   void startTag(std::string name, std::map<std::string, std::string> attr)
   {
     if(name == "aftale") {
@@ -877,6 +877,17 @@ TEST_EQUAL_STR(exp, j2, "Did we correctly append to the journal?");
 
 p.add_sogeord(CPR, "CA0003", "Nolder");
 
+{
+  std::vector<Praxisd::cave_t> cave = p.diverse_get_cave("A0001");
+  TEST_EQUAL_INT(cave.size(), 1, "Precicely one result.");
+  TEST_EQUAL_STR(cave[0].cave, "AZOPT", "The correct one?");
+}
+
+{
+  std::vector<Praxisd::cave_t> cave = p.diverse_get_cave("");
+  TEST_EQUAL_INT(cave.size(), 25, "Get them all.");
+}
+
 TEST_END;
 
 #endif/*TEST_PRAXISD*/
-- 
cgit v1.2.3