Skip to content

Commit 1817919

Browse files
papyrussolutionpapyrussolution
committed
Version 10.0.01
1 parent b7af761 commit 1817919

File tree

26 files changed

+632
-406
lines changed

26 files changed

+632
-406
lines changed

‎Src/Db/bdb.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,14 @@ int BDbDatabase::TransactionCheckPoint()
426426
return ok;
427427
}
428428

429+
int BDbDatabase::MemPoolSync()
430+
{
431+
int ok = 1;
432+
THROW(ProcessError(E->memp_sync(E, 0/*lsn*/)));
433+
CATCHZOK
434+
return ok;
435+
}
436+
429437
int BDbDatabase::LockDetect()
430438
{
431439
int ok = -1;
@@ -545,7 +553,7 @@ int BDbDatabase::Helper_Create(const char * pFileName, int createMode, BDbTable:
545553
}
546554
// } @v9.8.2
547555
{
548-
int opf = (DB_CREATE|DB_AUTO_COMMIT);
556+
int opf = (DB_CREATE|DB_AUTO_COMMIT|DB_MULTIVERSION); // @v10.0.1 DB_MULTIVERSION
549557
opf |= DB_THREAD;
550558
r = p_db->open(p_db, T.T, (r2 > 0) ? file_name.cptr() : 0, (r2 == 2) ? tbl_name.cptr() : 0, dbtype, opf, 0 /*mode*/);
551559
}

‎Src/Doc/VERSION.TXT‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15202,10 +15202,11 @@ Ver 1.2 Date 13/09/96
1520215202
-FIX: {�����} ������ ��� �������� ������ �� ������������ ��������� (WayBillAct_v3)
1520315203
-FIX: {DL600} ������, ����������� ������ � �������� ���������� ����� � ������ ������� ��� ���������
1520415204
� ������������ ������� UniformFileTransm()
15205-
13/04/2018 v10.0.1
15205+
15/04/2018 v10.0.1
1520615206
- {���������� �������� ����} ������� �������� ������� ����� ������������ ����.
15207+
!- {��� ���������} ��������� �������� ��������� �������� ���������� ������ - � ������� �������
15208+
��������� ����������� (�� �������� �� ���������� �����-�����������).
1520715209
-FIX: {UI} ������ ��� ������ ������ � ���������� ���������.
1520815210
-FIX: {���������� �������� ����} �� ���������������� ������, ������� ������������ �� ������� ����������� ���������.
1520915211
-FIX: {�������� ������ �����} ��������� � ������� ������ ��������������� ���������.
15210-
1521115212

‎Src/Include/Db.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4337,7 +4337,7 @@ class BDbDatabase {
43374337
oRecover = 0x00000001,
43384338
oPrivate = 0x00000002, // @v9.6.4 окружение (ENVIRONMENT) BerkeleyDB не может быть использовано разными процессами
43394339
oReadOnly = 0x00000004, // @v9.7.11 База данных открывается в режиме READ-ONLY
4340-
oWriteStatOnClose = 0x00000008 // @v9.7.11 При закрытии базы сохранять статистику по таблицам
4340+
oWriteStatOnClose = 0x00000008, // @v9.7.11 При закрытии базы сохранять статистику по таблицам
43414341
};
43424342
struct Config {
43434343
Config();
@@ -4391,6 +4391,7 @@ class BDbDatabase {
43914391
int RollbackWork();
43924392
int CommitWork();
43934393
int TransactionCheckPoint();
4394+
int MemPoolSync();
43944395
int LockDetect();
43954396
int CreateSequence(const char * pName, int64 initVal, long * pSeqID);
43964397
int CloseSequence(long seqId);

‎Src/Include/PPDBS.H‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// PPDBS.H
2-
// This file was generated by DL600C.EXE from 'D:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
2+
// This file was generated by DL600C.EXE from 'd:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
33
//
44
#ifndef __PPDBS_H
55
#define __PPDBS_H

‎Src/Include/Pp.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15358,6 +15358,8 @@ struct PPELink {
1535815358

1535915359
class PPELinkArray : public TSArray <PPELink> {
1536015360
public:
15361+
static int SLAPI SetupNewPhoneEntry(const char * pPhone, PPELink & rEntry);
15362+
1536115363
SLAPI PPELinkArray();
1536215364
int FASTCALL IsEqual(const PPELinkArray & rS) const;
1536315365
int SLAPI AddItem(PPID kindID, const char * pAddr);
@@ -22812,6 +22814,7 @@ class PPObjPerson : public PPObject {
2281222814
// другое - идентификатор диалога, который следует использовать.
2281322815
PPID SCardSeriesID;
2281422816
SString Name;
22817+
SString InitPhone; // @v10.0.01
2281522818
//
2281622819
PPID RetSCardID; // @out Ид дисконтной карты, созданной (выбранной) в сокращенном диалоге
2281722820
long UpdFlags; // -> PPPersonPacket::UpdFlags
@@ -22915,6 +22918,7 @@ class PPObjPerson : public PPObject {
2291522918
// Remark: Реализация опции sapfMatchWholeWord - отвратительна
2291622919
//
2291722920
int SLAPI GetListByPattern(const SrchAnalogPattern * pPattern, PPIDArray * pList);
22921+
int SLAPI GetListBySubstring(const char * pSubstr, PPID kindID, StrAssocArray * pList, int fromBegStr);
2291822922
#if 0 // @construction {
2291922923
struct Idb {
2292022924
Idb();

‎Src/Include/Private/VERDATA.INC‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//
22
// ..\INCLUDE\PRIVATE\VERDATA.INC
3-
// 2018-04-14T17:59:05
3+
// 2018-04-15T17:45:16
44
// Automaticaly generated file
55
// Don't modify!
66
//
77
0x24, 0x00, 0x00, 0x00, 0x33, 0x30, 0x79, 0x61, 0x52, 0x42, 0x44, 0x33, 0x44, 0x4f, 0x57, 0x45, 0x68, 0x31, 0x52, 0x66, 0x56, 0x32, 0x70, 0x74, 0x74, 0x7a, 0x51, 0x4a, 0x50, 0x59, 0x7a, 0x44,
8-
0x4a, 0x00, 0x66, 0xe6, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb3, 0x60, 0x0c, 0xca, 0x1c, 0x55, 0xdb, 0xbc, 0xd5, 0xcb, 0x06, 0x3e, 0xda, 0x8f, 0x0f, 0x5d, 0xff, 0x3b, 0x69, 0xc2, 0xa2, 0x06, 0x70,
9-
0x2a, 0xab, 0xbf, 0xbc, 0x0e, 0xfa, 0xc4, 0x6c, 0xfa, 0x13, 0x9d, 0x93, 0xa2, 0x9b, 0xd7, 0xd3, 0x90, 0x6a, 0xfc, 0x3c, 0x97, 0x65, 0x83, 0xef, 0x16, 0x15, 0xe1, 0x6b, 0xdd, 0xfb, 0xe7, 0x80,
10-
0x47, 0x9a, 0xf0, 0x0a, 0x7e, 0xa4, 0x8e, 0x2e, 0x8f, 0xd8, 0x64, 0x80, 0x66, 0xba, 0x51, 0x50, 0xed, 0x73, 0xdd, 0xfb, 0x69, 0x09, 0x95, 0xd8, 0x1d, 0x06, 0xc0, 0x96, 0x31, 0x82, 0x71, 0x94,
11-
0x92, 0xce, 0x54, 0x2b, 0x7d, 0x48, 0xca, 0xed, 0xcb, 0xbd, 0x90, 0x8f, 0xf8, 0x38, 0xaa, 0x84, 0x9c, 0xc4, 0x0b, 0x31, 0x70, 0xe4, 0x1b, 0xff, 0xdc, 0xb6, 0x67, 0x8e, 0xa0, 0x6a, 0xeb, 0x07,
12-
0x0e, 0x65, 0x50, 0x79, 0xc9, 0x91, 0xfe, 0xb6, 0x60, 0x74, 0xa5, 0x72, 0xf9, 0x62, 0x36, 0x6c, 0xfa, 0xa3, 0x82, 0x22, 0xce, 0x9c, 0x77, 0xed, 0x18, 0x61, 0x7b, 0x47, 0x16, 0xc5, 0x31, 0xea,
13-
0xf0, 0x01, 0x6d, 0x43, 0xb1, 0x29, 0x76, 0x97, 0x2e, 0x6f, 0xda, 0x38, 0x28, 0x51, 0x53, 0xc6, 0x86, 0x63, 0x35, 0x45, 0xf2, 0x15, 0xad, 0x9b, 0xf7, 0xff, 0xbf, 0x16, 0xee, 0xef, 0x48, 0x55,
14-
0xf3, 0x3f, 0x9f, 0xf7, 0xcc, 0x07, 0x27, 0xa1, 0x10, 0x3a, 0xd6, 0xe3, 0xa2, 0x9f, 0x52, 0xbf, 0x1b, 0x09, 0x0f, 0x89, 0xa4, 0x6a, 0xee, 0x03, 0xcb, 0x1c, 0xc0, 0xda, 0x72, 0x3a, 0xb0, 0x67
8+
0x4a, 0x00, 0x30, 0xea, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb3, 0x60, 0x0c, 0xca, 0x1c, 0x55, 0xdb, 0xbc, 0xd5, 0xcb, 0x05, 0x3f, 0xd2, 0x8e, 0x04, 0x32, 0x06, 0x22, 0xeb, 0x79, 0xbb, 0x62, 0x1d,
9+
0x3f, 0x21, 0xff, 0xcc, 0x5f, 0xfe, 0x0b, 0xfd, 0xe2, 0xa9, 0x9e, 0x35, 0xa3, 0x27, 0x18, 0xd4, 0x3a, 0x8e, 0xea, 0xd3, 0x4e, 0x6e, 0xea, 0x4f, 0x76, 0x3f, 0xa0, 0xcd, 0x25, 0x34, 0xa4, 0x91,
10+
0xe1, 0xfa, 0x64, 0xb6, 0x18, 0x9c, 0x9a, 0xad, 0x3a, 0x5f, 0x80, 0x36, 0xae, 0x18, 0x57, 0x9d, 0x38, 0xcb, 0xf2, 0x1e, 0x8f, 0xc6, 0xec, 0xd9, 0x21, 0x53, 0x2a, 0x3c, 0xa2, 0x98, 0x4b, 0x02,
11+
0x91, 0xad, 0x51, 0x7a, 0x4d, 0x70, 0xd3, 0xa2, 0x20, 0x27, 0x6d, 0x09, 0x44, 0x11, 0xe7, 0x83, 0xbc, 0x57, 0x68, 0x5c, 0x16, 0xe6, 0x35, 0x7a, 0x1b, 0xf9, 0xaa, 0x0f, 0xae, 0x62, 0x5f, 0xf6,
12+
0xc2, 0x35, 0x6d, 0xea, 0x51, 0x22, 0x37, 0x01, 0xca, 0x22, 0x23, 0x9d, 0x29, 0xae, 0xb0, 0xb8, 0xb1, 0xf0, 0xfa, 0xcd, 0x10, 0x09, 0x6e, 0xab, 0xfc, 0x63, 0x09, 0xbe, 0xba, 0xdc, 0x17, 0x70,
13+
0x2a, 0x52, 0x2e, 0x68, 0x58, 0x69, 0x96, 0x18, 0xb8, 0x28, 0x13, 0x4e, 0x42, 0xf3, 0x96, 0x13, 0x1f, 0xfe, 0x40, 0xbc, 0x6b, 0x24, 0x23, 0x3e, 0x63, 0x0d, 0x39, 0xee, 0x7c, 0x33, 0x08, 0xd4,
14+
0x11, 0x9a, 0x0f, 0x0b, 0x2c, 0x1f, 0x39, 0x26, 0xb2, 0x53, 0x23, 0x58, 0xe6, 0x76, 0xf7, 0x6f, 0x72, 0x58, 0x38, 0xd3, 0x0f, 0xb9, 0xdc, 0x69, 0x90, 0x98, 0x75, 0x26, 0xf9, 0xeb, 0xbf, 0x30

‎Src/Include/sartre.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,7 @@ class SrDatabase {
796796
// 0 - ошибка
797797
//
798798
int SetSimpleWordFlexiaModel(LEXID wordID, const SrWordForm & rWf, int32 * pResultWaId);
799+
int SetSimpleWordFlexiaModel_Express(LEXID wordID, long baseFormID, int32 * pResultWaId);
799800
//
800801
// Descr: Реализует базовый механизм извлечения признаков слова wordID из базы данных.
801802
// При извлечении учитываются префикс (pfxID) и суффикс (afxID) слова (если не нулевые).

‎Src/OSF/LIBXML/relaxng.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ static xmlRelaxNGDocumentPtr xmlRelaxNGLoadExternalRef(xmlRelaxNGParserCtxtPtr c
16911691

16921692
static const char * FASTCALL xmlRelaxNGDefName(xmlRelaxNGDefine * def)
16931693
{
1694-
if(def == NULL)
1694+
if(!def)
16951695
return ("none");
16961696
switch(def->type) {
16971697
case XML_RELAXNG_EMPTY: return ("empty");
@@ -2314,7 +2314,7 @@ static int xmlRelaxNGTryCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGDefinePt
23142314
static int FASTCALL xmlRelaxNGIsCompileable(xmlRelaxNGDefine * def)
23152315
{
23162316
int ret = -1;
2317-
if(def == NULL) {
2317+
if(!def) {
23182318
return -1;
23192319
}
23202320
if((def->type != XML_RELAXNG_ELEMENT) && (def->dflags & IS_COMPILABLE))
@@ -2863,7 +2863,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParseValue(xmlRelaxNGParserCtxtPtr ctxt, xm
28632863
xmlChar * library;
28642864
int success = 0;
28652865
xmlRelaxNGDefine * def = xmlRelaxNGNewDefine(ctxt, P_Node);
2866-
if(def == NULL)
2866+
if(!def)
28672867
return 0;
28682868
def->type = XML_RELAXNG_VALUE;
28692869
type = xmlGetProp(P_Node, BAD_CAST "type");
@@ -2949,7 +2949,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParseData(xmlRelaxNGParserCtxtPtr ctxt, xml
29492949
library = xmlRelaxNGGetDataTypeLibrary(ctxt, P_Node);
29502950
SETIFZ(library, sstrdup(BAD_CAST "http://relaxng.org/ns/structure/1.0"));
29512951
def = xmlRelaxNGNewDefine(ctxt, P_Node);
2952-
if(def == NULL) {
2952+
if(!def) {
29532953
SAlloc::F(type);
29542954
return 0;
29552955
}
@@ -3642,7 +3642,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParseInterleave(xmlRelaxNGParserCtxtPtr ctx
36423642
xmlRelaxNGDefinePtr last = NULL, cur;
36433643
xmlNode * child;
36443644
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3645-
if(def == NULL) {
3645+
if(!def) {
36463646
return 0;
36473647
}
36483648
def->type = XML_RELAXNG_INTERLEAVE;
@@ -3749,7 +3749,7 @@ static int xmlRelaxNGParseDefine(xmlRelaxNGParserCtxtPtr ctxt, xmlNode * P_Node)
37493749
xmlRngPErr(ctxt, P_Node, XML_RNGP_INVALID_DEFINE_NAME, "define name '%s' is not an NCName\n", name, 0);
37503750
}
37513751
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3752-
if(def == NULL) {
3752+
if(!def) {
37533753
SAlloc::F(name);
37543754
return -1;
37553755
}
@@ -3940,23 +3940,23 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
39403940
}
39413941
else if(IS_RELAXNG(P_Node, "empty")) {
39423942
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3943-
if(def == NULL)
3943+
if(!def)
39443944
return 0;
39453945
def->type = XML_RELAXNG_EMPTY;
39463946
if(P_Node->children)
39473947
xmlRngPErr(ctxt, P_Node, XML_RNGP_EMPTY_NOT_EMPTY, "empty: had a child node\n", 0, 0);
39483948
}
39493949
else if(IS_RELAXNG(P_Node, "text")) {
39503950
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3951-
if(def == NULL)
3951+
if(!def)
39523952
return 0;
39533953
def->type = XML_RELAXNG_TEXT;
39543954
if(P_Node->children)
39553955
xmlRngPErr(ctxt, P_Node, XML_RNGP_TEXT_HAS_CHILD, "text: had a child node\n", 0, 0);
39563956
}
39573957
else if(IS_RELAXNG(P_Node, "zeroOrMore")) {
39583958
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3959-
if(def == NULL)
3959+
if(!def)
39603960
return 0;
39613961
def->type = XML_RELAXNG_ZEROORMORE;
39623962
if(P_Node->children == NULL)
@@ -3966,7 +3966,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
39663966
}
39673967
else if(IS_RELAXNG(P_Node, "oneOrMore")) {
39683968
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3969-
if(def == NULL)
3969+
if(!def)
39703970
return 0;
39713971
def->type = XML_RELAXNG_ONEORMORE;
39723972
if(P_Node->children == NULL)
@@ -3976,7 +3976,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
39763976
}
39773977
else if(IS_RELAXNG(P_Node, "optional")) {
39783978
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3979-
if(def == NULL)
3979+
if(!def)
39803980
return 0;
39813981
def->type = XML_RELAXNG_OPTIONAL;
39823982
if(P_Node->children == NULL)
@@ -3986,7 +3986,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
39863986
}
39873987
else if(IS_RELAXNG(P_Node, "choice")) {
39883988
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3989-
if(def == NULL)
3989+
if(!def)
39903990
return 0;
39913991
def->type = XML_RELAXNG_CHOICE;
39923992
if(P_Node->children == NULL)
@@ -3996,7 +3996,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
39963996
}
39973997
else if(IS_RELAXNG(P_Node, "group")) {
39983998
def = xmlRelaxNGNewDefine(ctxt, P_Node);
3999-
if(def == NULL)
3999+
if(!def)
40004000
return 0;
40014001
def->type = XML_RELAXNG_GROUP;
40024002
if(P_Node->children == NULL)
@@ -4006,7 +4006,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
40064006
}
40074007
else if(IS_RELAXNG(P_Node, "ref")) {
40084008
def = xmlRelaxNGNewDefine(ctxt, P_Node);
4009-
if(def == NULL)
4009+
if(!def)
40104010
return 0;
40114011
def->type = XML_RELAXNG_REF;
40124012
def->name = xmlGetProp(P_Node, BAD_CAST "name");
@@ -4050,7 +4050,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
40504050
def = xmlRelaxNGParseValue(ctxt, P_Node);
40514051
else if(IS_RELAXNG(P_Node, "list")) {
40524052
def = xmlRelaxNGNewDefine(ctxt, P_Node);
4053-
if(def == NULL)
4053+
if(!def)
40544054
return 0;
40554055
def->type = XML_RELAXNG_LIST;
40564056
if(P_Node->children == NULL)
@@ -4064,7 +4064,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
40644064
def = xmlRelaxNGProcessExternalRef(ctxt, P_Node);
40654065
else if(IS_RELAXNG(P_Node, "notAllowed")) {
40664066
def = xmlRelaxNGNewDefine(ctxt, P_Node);
4067-
if(def == NULL)
4067+
if(!def)
40684068
return 0;
40694069
def->type = XML_RELAXNG_NOT_ALLOWED;
40704070
if(P_Node->children)
@@ -4098,7 +4098,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePattern(xmlRelaxNGParserCtxtPtr ctxt,
40984098
return 0;
40994099
}
41004100
def = xmlRelaxNGNewDefine(ctxt, P_Node);
4101-
if(def == NULL)
4101+
if(!def)
41024102
return 0;
41034103
def->type = XML_RELAXNG_PARENTREF;
41044104
def->name = xmlGetProp(P_Node, BAD_CAST "name");
@@ -4519,7 +4519,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePatterns(xmlRelaxNGParserCtxtPtr ctxt,
45194519
while(nodes) {
45204520
if(IS_RELAXNG(nodes, "element")) {
45214521
xmlRelaxNGDefine * cur = xmlRelaxNGParseElement(ctxt, nodes);
4522-
if(def == NULL) {
4522+
if(!def) {
45234523
def = last = cur;
45244524
}
45254525
else {
@@ -4536,7 +4536,7 @@ static xmlRelaxNGDefinePtr xmlRelaxNGParsePatterns(xmlRelaxNGParserCtxtPtr ctxt,
45364536
else {
45374537
xmlRelaxNGDefine * cur = xmlRelaxNGParsePattern(ctxt, nodes);
45384538
if(cur) {
4539-
if(def == NULL) {
4539+
if(!def) {
45404540
def = last = cur;
45414541
}
45424542
else {
@@ -4569,15 +4569,15 @@ static int xmlRelaxNGParseStart(xmlRelaxNGParserCtxtPtr ctxt, xmlNode * nodes)
45694569
}
45704570
if(IS_RELAXNG(nodes, "empty")) {
45714571
def = xmlRelaxNGNewDefine(ctxt, nodes);
4572-
if(def == NULL)
4572+
if(!def)
45734573
return -1;
45744574
def->type = XML_RELAXNG_EMPTY;
45754575
if(nodes->children)
45764576
xmlRngPErr(ctxt, nodes, XML_RNGP_EMPTY_CONTENT, "element empty is not empty\n", 0, 0);
45774577
}
45784578
else if(IS_RELAXNG(nodes, "notAllowed")) {
45794579
def = xmlRelaxNGNewDefine(ctxt, nodes);
4580-
if(def == NULL)
4580+
if(!def)
45814581
return -1;
45824582
def->type = XML_RELAXNG_NOT_ALLOWED;
45834583
if(nodes->children)

0 commit comments

Comments
 (0)