From 30375496b0b14bc679c919c39bc69db3c0cf3364 Mon Sep 17 00:00:00 2001 From: Karel Slany Date: Tue, 4 Jul 2017 14:11:21 +0200 Subject: [PATCH] Added OVM_FO, OVM_PFO and OVM_PO box types. --- client/common.c | 3 +++ doc/box | 13 ++++++++++--- doc/libisds.xml | 31 +++++++++++++++++++++++++++---- doc/user_web_services | 3 +++ src/isds.c | 9 +++++++++ src/isds.h | 9 ++++++--- test/offline/isds-dbtype.c | 6 ++++++ 7 files changed, 64 insertions(+), 10 deletions(-) diff --git a/client/common.c b/client/common.c index 66f4b75..bb64a30 100644 --- a/client/common.c +++ b/client/common.c @@ -108,6 +108,9 @@ void print_DbType(const long int *type) { case DBTYPE_OVM_NOTAR: printf("OVM_NOTAR\n"); break; case DBTYPE_OVM_EXEKUT: printf("OVM_EXEKUT\n"); break; case DBTYPE_OVM_REQ: printf("OVM_REQ\n"); break; + case DBTYPE_OVM_FO: printf("OVM_FO\n"); break; + case DBTYPE_OVM_PFO: printf("OVM_PFO\n"); break; + case DBTYPE_OVM_PO: printf("OVM_PO\n"); break; default: printf("\n", *type); } } diff --git a/doc/box b/doc/box index 7b13c43..d80b4f9 100644 --- a/doc/box +++ b/doc/box @@ -17,14 +17,21 @@ Symbol Number Description 0 ISDS system OVM 10 Standard government (state or municipality or similar) office -OVM_NOTAR 11 Notary -OVM_EXEKUT 12 Executor +OVM_NOTAR 11 Notary (stopped being used, replaced with OVM_PFO) +OVM_EXEKUT 12 Executor (stopped being used, replaced with OVM_PFO) OVM_REQ 13 Subsidiary office with OVM status assigned on request (section 6 and 7 of act) +OVM_FO 14 Natural person with OVM status + (without identification number) +OVM_PFO 15 Natural person in business with OVM status + (e.g. notary or executor) +OVM_PO 16 Juridical person with OVM status + (arisen from previously existing PO or PO_REQ) PO 20 Standard commercial organization (in trade registry) PO_ZAK 21 Other organization based on law + (stopped being used, replaced with PO) PO_REQ 22 Organization with box assigned on request -PFO 30 Person in bussiness +PFO 30 Person in business PFO_ADVOK 31 Lawyer PFO_DANPOR 32 Tax consultant PFO_INSSPR 33 Administrator of insolvency diff --git a/doc/libisds.xml b/doc/libisds.xml index 977949e..5c36469 100644 --- a/doc/libisds.xml +++ b/doc/libisds.xml @@ -876,12 +876,14 @@ err = isds_cleanup(); DBTYPE_OVM_NOTAR - Notary. + Notary (stopped being used, replaced with + OVM_PFO). DBTYPE_OVM_EXEKUT - Executor. + Executor (stopped being used, replaced with + OVM_PFO). @@ -892,6 +894,25 @@ err = isds_cleanup(); + DBTYPE_OVM_FO + Natural person with OVM status + (without identification number). + + + + DBTYPE_OVM_PFO + Natural person in business with OVM + status (e.g. notary or executor). + + + + DBTYPE_OVM_PO + Juridical person with OVM status + (arisen from previously existing PO or + PO_REQ). + + + DBTYPE_PO Standard commercial organization (listed in trade registry). @@ -899,7 +920,9 @@ err = isds_cleanup(); DBTYPE_PO_ZAK - Other organization founded by an act. + Other organization founded by an act + (stopped being used, replaced with + PO). @@ -910,7 +933,7 @@ err = isds_cleanup(); DBTYPE_PFO - Person in bussiness. + Person in business. diff --git a/doc/user_web_services b/doc/user_web_services index 20f6bab..be95452 100644 --- a/doc/user_web_services +++ b/doc/user_web_services @@ -878,6 +878,9 @@ OVM OVM_MAIN Search over main (without suboridanated, with secondary) OVM box types only OVM_REQ +OVM_FO +OVM_PFO +OVM_PO OVM_NOTAR OVM_EXEKUT PO diff --git a/src/isds.c b/src/isds.c index d000462..e88f75c 100644 --- a/src/isds.c +++ b/src/isds.c @@ -2030,6 +2030,12 @@ static isds_error string2isds_DbType(xmlChar *string, isds_DbType *type) { *type = DBTYPE_OVM_EXEKUT; else if (!xmlStrcmp(string, BAD_CAST "OVM_REQ")) *type = DBTYPE_OVM_REQ; + else if (!xmlStrcmp(string, BAD_CAST "OVM_FO")) + *type = DBTYPE_OVM_FO; + else if (!xmlStrcmp(string, BAD_CAST "OVM_PFO")) + *type = DBTYPE_OVM_PFO; + else if (!xmlStrcmp(string, BAD_CAST "OVM_PO")) + *type = DBTYPE_OVM_PO; else return IE_ENUM; return IE_SUCCESS; @@ -2055,6 +2061,9 @@ static const xmlChar *isds_DbType2string(const isds_DbType type) { case DBTYPE_OVM_NOTAR: return(BAD_CAST "OVM_NOTAR"); break; case DBTYPE_OVM_EXEKUT: return(BAD_CAST "OVM_EXEKUT"); break; case DBTYPE_OVM_REQ: return(BAD_CAST "OVM_REQ"); break; + case DBTYPE_OVM_FO: return(BAD_CAST "OVM_FO"); break; + case DBTYPE_OVM_PFO: return(BAD_CAST "OVM_PFO"); break; + case DBTYPE_OVM_PO: return(BAD_CAST "OVM_PO"); break; default: return NULL; break; } } diff --git a/src/isds.h b/src/isds.h index b92e3c7..68d96b8 100644 --- a/src/isds.h +++ b/src/isds.h @@ -183,11 +183,14 @@ typedef enum { DBTYPE_SYSTEM = 0, /* This is special sender value for messages sent by ISDS. */ DBTYPE_OVM = 10, - DBTYPE_OVM_NOTAR = 11, - DBTYPE_OVM_EXEKUT = 12, + DBTYPE_OVM_NOTAR = 11, /* This type has been replaced with OVM_PFO. */ + DBTYPE_OVM_EXEKUT = 12, /* This type has been replaced with OVM_PFO. */ DBTYPE_OVM_REQ = 13, + DBTYPE_OVM_FO = 14, + DBTYPE_OVM_PFO = 15, + DBTYPE_OVM_PO = 16, DBTYPE_PO = 20, - DBTYPE_PO_ZAK = 21, + DBTYPE_PO_ZAK = 21, /* This type has been replaced with PO. */ DBTYPE_PO_REQ = 22, DBTYPE_PFO = 30, DBTYPE_PFO_ADVOK = 31, diff --git a/test/offline/isds-dbtype.c b/test/offline/isds-dbtype.c index 28fa34b..55a227f 100644 --- a/test/offline/isds-dbtype.c +++ b/test/offline/isds-dbtype.c @@ -52,6 +52,9 @@ int main(void) { DBTYPE_OVM_NOTAR, DBTYPE_OVM_EXEKUT, DBTYPE_OVM_REQ, + DBTYPE_OVM_FO, + DBTYPE_OVM_PFO, + DBTYPE_OVM_PO, DBTYPE_PO, DBTYPE_PO_ZAK, DBTYPE_PO_REQ, @@ -68,6 +71,9 @@ int main(void) { BAD_CAST "OVM_NOTAR", BAD_CAST "OVM_EXEKUT", BAD_CAST "OVM_REQ", + BAD_CAST "OVM_FO", + BAD_CAST "OVM_PFO", + BAD_CAST "OVM_PO", BAD_CAST "PO", BAD_CAST "PO_ZAK", BAD_CAST "PO_REQ", -- 2.11.4.GIT