Finished Praxisd code. Now it works both in sync and async modes.

1 files changed, 79 insertions, 67 deletions

diff --git a/client/praxisd.h b/client/praxisd.h
index c9ccaf3..b4b673c 100644
--- a/client/praxisd.h
+++ b/client/praxisd.h
@@ -39,6 +39,71 @@
 #include <QThread>
 #include <QSemaphore>
 
+typedef struct {
+  QString sogenr;
+  QString cave;
+  QString bemaerkning1;
+  QString bemaerkning2;
+  QString bemaerkning3;
+} cave_t;
+
+typedef struct {
+  QString sogenr;
+  QString sogedato;
+  QString sogetxt;
+} sogeord_t;
+
+typedef struct {
+  QString cpr;
+  QString fornavne;
+  QString efternavn;
+  QString stilling;
+  QString gade;
+  QString by;
+  QString telefonnumre;
+  QString sikringsgr;
+  QString amtsnr;
+  QString sygekontor;
+  QString henvnr;
+  QString frilinie1;
+  QString frilinie2;
+  QString frilinie3;
+  QString frilinie4;
+  QString frilinie5;
+  QVector<sogeord_t> sogeord;
+  QString ydernr;
+  QString created;
+  QString donottouch;
+  QString visus;
+  QString labkort;
+  QString medkort;
+  QString jlock;
+  QString unknown1;
+  QString henvdato;
+  QString aarhund;
+  QString fakturadato;
+  QString fakturabelob;
+  QString betaldato;
+  QString betalbelob;
+  QString jdato;
+  QString unknown250;
+  QString unknown251;
+  QString jtime;
+} patient_t;
+
+typedef struct {
+  QString cpr;
+  QString group;
+  QString subject;
+  QString filename;
+  size_t filesize;
+  QString date;
+} dokmenu_t;
+
+typedef QVector<cave_t> CaveVector;
+typedef patient_t Patient;
+typedef QVector<dokmenu_t> DokMenuVector;
+
 class Praxisd : public QObject {
 Q_OBJECT
 public:
@@ -54,68 +119,10 @@ public:
 
   void journal_get_by_cpr(QString patientid);
 
-  typedef struct {
-    QString sogenr;
-    QString cave;
-    QString bemaerkning1;
-    QString bemaerkning2;
-    QString bemaerkning3;
-  } cave_t;
   void diverse_get_cave(QString sogenr);
 
-  typedef struct {
-    QString sogenr;
-    QString sogedato;
-    QString sogetxt;
-  } sogeord_t;
-
-  typedef struct {
-    QString cpr;
-    QString fornavne;
-    QString efternavn;
-    QString stilling;
-    QString gade;
-    QString by;
-    QString telefonnumre;
-    QString sikringsgr;
-    QString amtsnr;
-    QString sygekontor;
-    QString henvnr;
-    QString frilinie1;
-    QString frilinie2;
-    QString frilinie3;
-    QString frilinie4;
-    QString frilinie5;
-    QVector<sogeord_t> sogeord;
-    QString ydernr;
-    QString created;
-    QString donottouch;
-    QString visus;
-    QString labkort;
-    QString medkort;
-    QString jlock;
-    QString unknown1;
-    QString henvdato;
-    QString aarhund;
-    QString fakturadato;
-    QString fakturabelob;
-    QString betaldato;
-    QString betalbelob;
-    QString jdato;
-    QString unknown250;
-    QString unknown251;
-    QString jtime;
-  } patient_t;
   void patient_get_by_cpr(QString cpr);
 
-  typedef struct {
-    QString cpr;
-    QString group;
-    QString subject;
-    QString filename;
-    size_t filesize;
-    QString date;
-  } dokmenu_t;
   void dokmenu_get_all_by_cpr(QString cpr);
 
   void dokmenu_get_by_cpr_and_name(QString cpr, QString name);
@@ -125,9 +132,9 @@ signals:
   void networkError(QString text);
 
   void gotJournal(QString data);
-  void gotCave(QVector<cave_t> cave);
-  void gotPatient(patient_t patient);
-  void gotDokMenu(QVector<dokmenu_t> dokmenu);
+  void gotCaveList(CaveVector cave);
+  void gotPatient(Patient patient);
+  void gotDokMenu(DokMenuVector dokmenu);
   void gotDokMenuFile(QString data);
 
 public slots:
@@ -151,25 +158,30 @@ public:
   PraxisdSync(QString host, unsigned short int port);
 
   QString journal_get_by_cpr(QString patientid);
-  QVector<Praxisd::cave_t> diverse_get_cave(QString sogenr);
-  Praxisd::patient_t patient_get_by_cpr(QString cpr);
-  QVector<Praxisd::dokmenu_t> dokmenu_get_all_by_cpr(QString cpr);
+  CaveVector diverse_get_cave(QString sogenr);
+  Patient patient_get_by_cpr(QString cpr);
+  DokMenuVector dokmenu_get_all_by_cpr(QString cpr);
   QString dokmenu_get_by_cpr_and_name(QString cpr, QString name);
 
   void run();
 
 public slots:
-  void gotCaveList(QVector<Praxisd::cave_t>);
+  void gotCaveList(CaveVector);
+  void gotDokMenu(DokMenuVector);
 
 private:
-  Praxisd praxisd;
+  QString host;
+  quint16 port;
+
   QSemaphore rsem;
   QSemaphore wsem;
 
   Praxisd::reply_t request_type;
   QString request_sogenr;
+  QString request_cpr;
 
-  QVector<Praxisd::cave_t> cavelist;
+  CaveVector cavelist;
+  DokMenuVector dokmenu;
 };
 
 #endif/*__PRACRO_PRAXISD_H__*/