From 69d26642da5ca087b5f3acb7dd77fbd0344f085a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 17 Nov 2011 14:29:25 +0100 Subject: Remove common VERSION file and put version numbers directly in configure.in and client.pro files allowing for diverging versions. --- client/client.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'client') diff --git a/client/client.pro b/client/client.pro index 61a6e06..dce4838 100644 --- a/client/client.pro +++ b/client/client.pro @@ -16,8 +16,7 @@ debug { DEFINES+=USE_DEBUG } -include(../VERSION) -DEFINES+=VERSION=\\\"$$VERSION\\\" +DEFINES+=VERSION=\\\"2.2.0\\\" win32 { LIBPATH += lua/lib -- cgit v1.2.3 From 867a4bee43cad43aa5855c138e53ce27c7ea5847 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 23 Nov 2011 14:56:47 +0100 Subject: Fix horrible bug in PatientParser using only the last sogeord in the list if more than one present. --- client/praxisd.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'client') diff --git a/client/praxisd.cc b/client/praxisd.cc index 001eb90..161b471 100644 --- a/client/praxisd.cc +++ b/client/praxisd.cc @@ -104,18 +104,16 @@ static Patient getPatient(QByteArray data) DOPATIENT(frilinie5); if(element.tagName() == "sogeords") { - sogeord_t sogeord; - QDomNodeList nodes = element.childNodes(); for(int j = 0; j < nodes.count(); j++) { + sogeord_t sogeord; QDomNode node = nodes.at(j); QDomElement element = node.toElement(); sogeord.sogenr = element.attribute("sogenr"); sogeord.sogedato = element.attribute("sogedato"); sogeord.sogetxt = element.text(); + patient.sogeord.push_back(sogeord); } - - patient.sogeord.push_back(sogeord); } DOPATIENT(ydernr); -- cgit v1.2.3 From 07244d0376e2e25eaeba913e684bd06122ded893 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 23 Nov 2011 15:03:04 +0100 Subject: Tick version. --- client/client.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client') diff --git a/client/client.pro b/client/client.pro index dce4838..e002942 100644 --- a/client/client.pro +++ b/client/client.pro @@ -16,7 +16,7 @@ debug { DEFINES+=USE_DEBUG } -DEFINES+=VERSION=\\\"2.2.0\\\" +DEFINES+=VERSION=\\\"2.2.1\\\" win32 { LIBPATH += lua/lib -- cgit v1.2.3