Skip to content

Commit bcafe8b

Browse files
papyrussolutionpapyrussolution
committed
Version 9.7.8
1 parent f2d2265 commit bcafe8b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2335
-71085
lines changed

‎Src/Db/bdb.cpp‎

Lines changed: 116 additions & 60 deletions
Large diffs are not rendered by default.

‎Src/Doc/VERSION.TXT‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14855,4 +14855,12 @@ Ver 1.2 Date 13/09/96
1485514855
-FIX: {�����} 2-� ������ ���������.
1485614856
-FIX: {��������������} ������ � ����������� ��������� ������.
1485714857
-FIX: ���������� ��������� �������� ����� ������� ����������� ������.
14858+
23/07/2017 v9.7.8
14859+
!- {��� ���������} � ������� ��������� ��������� ��������� ���������� ��������� �����������
14860+
��������� ��������� ������� ����������.
14861+
!- {��� ����} � ��������� ������������� ����� �������� ����� �������� ���� �����������
14862+
��������� �� ������ � ��� ���� (���� � ���� ��� ������ ���� � ����� ����� ������ ���� ��� ����������� ���������).
14863+
!- {������� �������} ��������� ��������� ������ ��� �������� (�������� ���������� ������ - �����).
14864+
- {�������� ����} � ������ ��������� ���������� �� ��������� ���� �������� �������� ����� ������.
14865+
-FIX: {�������� ����} [9.7.7] ������ � �������� �������� ����.
1485814866

‎Src/Include/Db.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ int btrnfound__();
954954
#define BE_BDB_INVALSP 10011 // Недопустимое значение параметра поиска записи
955955
#define BE_DBD_REPLEASEEXPIRED 10012 // (DB_REP_LEASE_EXPIRED) Master lease has expired
956956
#define BE_DBD_INNERTXN 10013 // Другая транзакция BDB еще активна
957+
#define BE_BDB_UNDEFSERIALIZECTX 10014 // Не определен контекст синхронизации для экземпляра BDbDatabase
957958
//
958959
// Database library error codes (18/06/99)
959960
//
@@ -4166,7 +4167,7 @@ class BDbDatabase {
41664167

41674168
static SString & MakeFileName(const char * pFile, const char * pTblName, SString & rFileName);
41684169
static int SplitFileName(const char * pFileName, SString & rFile, SString & rTbl);
4169-
static int FASTCALL ProcessError(int bdbErrCode, const char * pAddedMsg = 0);
4170+
static int FASTCALL ProcessError(int bdbErrCode, const DB * pDb, const char * pAddedMsg);
41704171

41714172
BDbDatabase(const char * pHomeDir, Config * pCfg = 0, long options = 0);
41724173
~BDbDatabase();
@@ -4194,10 +4195,7 @@ class BDbDatabase {
41944195
int CloseSequence(long seqId);
41954196
int GetSequence(long seqId, int64 * pVal);
41964197

4197-
SSerializeContext * GetSCtx() const
4198-
{
4199-
return P_SCtx;
4200-
}
4198+
SSerializeContext * GetSCtx() const;
42014199
private:
42024200
int Helper_Create(const char * pFileName, int createMode, BDbTable::Config * pCfg);
42034201
int Helper_SetConfig(const char * pHomeDir, Config & rCfg);

‎Src/Include/PPDEFS.H‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10180,6 +10180,10 @@
1018010180
#define CTL_WOBARCODE_ANGLE (3 + WINDOWS_ID_BIAS)
1018110181
#define DLG_INVITEMQ 1323 // Быстрый ввод строки инвентаризации по коду с количесвом
1018210182
// CTL_INVITEM_XXX
10183+
#define DLG_PRCRSARTR 1324
10184+
#define CTL_PRCRSARTR_SRCPATH (1 + WINDOWS_ID_BIAS)
10185+
#define CTLBRW_PRCRSARTR_SRCPATH (2 + WINDOWS_ID_BIAS)
10186+
#define CTL_PRCRSARTR_FLAGS (3 + WINDOWS_ID_BIAS)
1018310187
//
1018410188
// Win32 Dialog Identifiers
1018510189
//

‎Src/Include/PPMENU.H‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,6 @@
504504
#define cmProcessOsm 609 // @v9.5.9 Ïðîöåññèíã äàííûõ OpenStreetMap
505505
#define cmPosNodeQuery 610 // @v9.6.5 Èíòåðàêòèâíûé çàïðîñ ê êàññîâîìó óçëó
506506
#define cmTestLogWindow 611 // @v9.7.0 Òåñòèðîâàíèå îêíà âûâîäà ñîîáùåíèé
507-
#define cmImportSartre 612 // @v9.7.8 Èìïîðò äàííûõ ïðîåêòà Sartre
507+
#define cmProcessSartre 612 // @v9.7.8 Èìïîðò äàííûõ ïðîåêòà Sartre
508508

509509
#endif /* __PPMENU_H */

‎Src/Include/Pp.h‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19694,6 +19694,8 @@ typedef TSCollection <PPSmsAccount> PPSmsAccntArray;
1969419694
class PPObjSmsAccount : public PPObjReference {
1969519695
public:
1969619696
static int SLAPI VerifyString(const SString & rStr, int options);
19697+
static int SLAPI BeginDelivery(PPID accID, StrAssocArray & rPrsnIdArr, StrAssocArray & rPhoneArr);
19698+
static int SLAPI BeginDelivery(PPID accID, StrAssocArray & rPrsnIdArr, StrAssocArray & rPhoneArr, PPID objTypeId, StrAssocArray & rObjIdArr);
1969719699

1969819700
SLAPI PPObjSmsAccount(void * extraPtr = 0);
1969919701
virtual int SLAPI Edit(PPID * pID, void * extraPtr);
@@ -19703,8 +19705,6 @@ class PPObjSmsAccount : public PPObjReference {
1970319705
};
1970419706

1970519707
int GetSmsConfig(PPSmsAccPacket & rPack, StConfig & rConfig);
19706-
int BeginDelivery(PPID accID, StrAssocArray & rPrsnIdArr, StrAssocArray & rPhoneArr);
19707-
int BeginDelivery(PPID accID, StrAssocArray & rPrsnIdArr, StrAssocArray & rPhoneArr, PPID objTypeId, StrAssocArray & rObjIdArr);
1970819708
int FormatPhone(const char * pOldPhone, SString & rNewPhone, SString & rMsg);
1970919709

1971019710
class PPSmsSender {
@@ -46043,6 +46043,42 @@ class PrcssrOsm {
4604346043
PPLogger Logger;
4604446044
};
4604546045
//
46046+
//
46047+
//
46048+
class PrcssrSartreFilt : public PPBaseFilt { // @persistent
46049+
public:
46050+
SLAPI PrcssrSartreFilt();
46051+
PrcssrSartreFilt & FASTCALL operator = (const PrcssrSartreFilt & rS);
46052+
int SLAPI IsEmpty() const;
46053+
46054+
enum {
46055+
fImportFlexia = 0x0001,
46056+
fImportConcepts = 0x0002,
46057+
fImportHumNames = 0x0004,
46058+
fTestFlexia = 0x0008,
46059+
fTestConcepts = 0x0010
46060+
};
46061+
uint8 ReserveStart[32]; // @ancor
46062+
long Flags;
46063+
uint8 ReserveEnd[32];
46064+
SString SrcPath; // @anchor
46065+
};
46066+
46067+
class PrcssrSartre {
46068+
public:
46069+
SLAPI PrcssrSartre(const char * pDbPath);
46070+
SLAPI ~PrcssrSartre();
46071+
int SLAPI InitParam(PPBaseFilt * pBaseFilt);
46072+
int SLAPI EditParam(PPBaseFilt * pBaseFilt);
46073+
int SLAPI Init(const PPBaseFilt * pBaseFilt);
46074+
int SLAPI Run();
46075+
private:
46076+
int SLAPI TestSearchWords();
46077+
int SLAPI TestConcept();
46078+
46079+
PrcssrSartreFilt P;
46080+
};
46081+
//
4604646082
// Descr: Шаблон функции получения указателя на объектный кэш, локальный по отношению к базе данных
4604746083
// Используется при обращении объекта PPObject к кэшу.
4604846084
// Example:
@@ -50193,6 +50229,7 @@ int SLAPI DoDebtRate();
5019350229
int SLAPI DoBizScore(PPID bzsID);
5019450230
int SLAPI DoProcessObjText(PrcssrObjTextFilt * pFilt);
5019550231
int SLAPI DoProcessOsm(PrcssrOsmFilt * pFilt);
50232+
int SLAPI DoProcessSartre(PrcssrSartreFilt * pFilt);
5019650233
int SLAPI DoConstructionTest();
5019750234

5019850235
template <typename Dlg, typename D> int PPDialogProcBodyID(uint dlgID, D * pData)

‎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-
// 2017-07-22T13:19:30
3+
// 2017-07-23T18:32:28
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, 0x0a, 0x2c, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb3, 0x60, 0x0c, 0xca, 0x1c, 0x56, 0xdb, 0x4b, 0x20, 0x4c, 0x5c, 0x5f, 0x89, 0x73, 0xc9, 0x45, 0xdd, 0x6e, 0x09, 0x98, 0x1e, 0x03, 0x64,
9-
0x2c, 0x89, 0xa0, 0x45, 0x0d, 0x03, 0x53, 0xa6, 0x6f, 0x33, 0xc1, 0x56, 0x97, 0x48, 0x89, 0xd1, 0xbb, 0x64, 0x1c, 0xb1, 0xe5, 0x4e, 0x5b, 0xd7, 0xc4, 0x1d, 0x96, 0x4c, 0x46, 0x42, 0x7d, 0xc9,
10-
0x54, 0xff, 0x9b, 0x7e, 0xf8, 0x98, 0x1c, 0x42, 0x82, 0x9c, 0x0c, 0x09, 0xc6, 0x6d, 0x8b, 0x6f, 0x36, 0x4e, 0xa6, 0x1c, 0x8e, 0x77, 0x3c, 0x69, 0xe2, 0xb3, 0x47, 0xe6, 0x6c, 0x8d, 0xca, 0xe1,
11-
0xca, 0x12, 0xb9, 0x0f, 0xf9, 0xd5, 0x71, 0x5f, 0x1d, 0x5b, 0x7b, 0xaf, 0x03, 0xd4, 0x7b, 0xce, 0x79, 0xa4, 0x8f, 0x4a, 0xe2, 0x24, 0x6a, 0x73, 0xc2, 0x3a, 0xc3, 0x63, 0x58, 0x3d, 0x2c, 0xbc,
12-
0x31, 0x50, 0x87, 0xbb, 0x3c, 0x98, 0x30, 0x66, 0x03, 0x08, 0x8a, 0x84, 0x7f, 0x16, 0x9f, 0x68, 0x62, 0xfd, 0x06, 0x62, 0x8c, 0xce, 0xbb, 0xa9, 0x1b, 0xbf, 0x9f, 0xd7, 0x26, 0x7f, 0x53, 0x21,
13-
0x9e, 0x16, 0x6f, 0x98, 0x5d, 0x68, 0x6b, 0x63, 0xf4, 0xac, 0xd7, 0x2f, 0x01, 0x45, 0x14, 0x58, 0x07, 0x8f, 0x15, 0x63, 0xd5, 0xab, 0xca, 0x36, 0x80, 0x0e, 0x34, 0x51, 0x60, 0xb8, 0xb9, 0x78,
14-
0x62, 0xaa, 0x5b, 0x91, 0x0e, 0x1c, 0x18, 0x8d, 0x42, 0x2d, 0xbc, 0xc8, 0x2d, 0xdf, 0x2e, 0x89, 0xa7, 0x6e, 0xcc, 0xf4, 0x1b, 0x31, 0x46, 0xcf, 0x86, 0xdf, 0x19, 0x99, 0x3c, 0xee, 0xc9, 0x4f
8+
0x4a, 0x00, 0x8f, 0xad, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb3, 0x60, 0x0c, 0xca, 0x1c, 0x56, 0xdb, 0x4b, 0x20, 0x4c, 0x5c, 0x5f, 0x89, 0x73, 0xc9, 0x45, 0xdd, 0x64, 0x09, 0x98, 0x1e, 0x03, 0x64,
9+
0xf1, 0x67, 0x91, 0x96, 0x44, 0x8f, 0x8a, 0x5d, 0xfd, 0x2e, 0x74, 0x3d, 0xf4, 0xe5, 0xc2, 0xac, 0x3e, 0x25, 0x4c, 0xf6, 0xef, 0xc9, 0x4b, 0x2c, 0x8b, 0x93, 0xaa, 0xde, 0xb8, 0xbd, 0x4a, 0xa6,
10+
0x9e, 0x22, 0x08, 0xb4, 0x9d, 0xd8, 0x84, 0x22, 0x82, 0x87, 0xb8, 0x09, 0xad, 0x4f, 0x3d, 0x29, 0xa3, 0x9b, 0x93, 0xa4, 0xd0, 0xc3, 0x5a, 0xd2, 0x51, 0x83, 0x8a, 0xf1, 0xa5, 0x2f, 0x2d, 0xa8,
11+
0x31, 0x97, 0x11, 0xb4, 0xe4, 0xfd, 0xc9, 0x65, 0xe4, 0xe0, 0xd2, 0x6b, 0x56, 0x3c, 0x9c, 0x1c, 0x43, 0x02, 0xe5, 0x5b, 0x39, 0x7a, 0x29, 0xec, 0x85, 0x68, 0x33, 0x76, 0x1e, 0xbb, 0xc3, 0xb2,
12+
0x8f, 0x03, 0x1e, 0xd6, 0x9b, 0x05, 0x18, 0x09, 0x8a, 0x97, 0x4d, 0x58, 0xb0, 0x67, 0xb5, 0xaa, 0xfb, 0x26, 0xa9, 0xe2, 0xae, 0xda, 0x2b, 0xbf, 0xa5, 0xb9, 0x9d, 0x6a, 0x66, 0xd4, 0x8e, 0x4a,
13+
0xec, 0x6e, 0x35, 0xc3, 0xfe, 0x70, 0x3d, 0xd0, 0xef, 0xf6, 0xdc, 0x79, 0xb3, 0x9b, 0x4f, 0x04, 0xc0, 0x48, 0x73, 0x0f, 0x17, 0xa3, 0x9e, 0xbf, 0x75, 0xef, 0x2c, 0xf8, 0x96, 0xc1, 0xf3, 0x79,
14+
0x8d, 0x64, 0xbe, 0x85, 0x22, 0xcd, 0x74, 0xf5, 0x37, 0x11, 0x6e, 0x51, 0x18, 0x45, 0x6a, 0x24, 0xa0, 0x0f, 0xe1, 0x84, 0x2b, 0x75, 0xcb, 0x3a, 0x41, 0x92, 0xad, 0x65, 0xaa, 0x2a, 0x17, 0xb0

‎Src/Include/SLIB.H‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,6 +2026,7 @@ private:
20262026
#define SLERR_WMI_EXECMETHOD 216 // Ошибка вызова метода WMI ExecMethod '%s'
20272027
#define SLERR_WMI_EXECMETHODRETVAL 217 // Код возврата созданного процесса '%s' не равен 0
20282028
#define SLERR_GLOBOBJIDXNFOUNT 218 // Не найден глобальный объект SLib по индексу %s
2029+
#define SLERR_LANGSYMBNFOUND 219 // Не найден символ языка '%s'
20292030
//
20302031
//
20312032
//

0 commit comments

Comments
 (0)