Skip to content

Commit 711a64a

Browse files
xengine-qytxengine-qyt
committed
modify:database rewrite file support
1 parent b9e394b commit 711a64a

File tree

9 files changed

+97
-54
lines changed

9 files changed

+97
-54
lines changed

‎XEngine_Source/StorageModule_Database/Database_Define.h‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,17 @@ extern "C" BOOL Database_Help_Insert(TCHAR* ptszSQLBuffer, XSTORAGECORE_DBFILE*
7171
类型：常量字符指针
7272
可空：Y
7373
意思：输入BUCKET名
74-
参数.四：lpszFileName
74+
参数.四：lpszFilePath
75+
In/Out：In
76+
类型：常量字符指针
77+
可空：Y
78+
意思：输入文件路径
79+
参数.五：lpszFileName
7580
In/Out：In
7681
类型：常量字符指针
7782
可空：Y
7883
意思：输入文件名称
79-
参数.五：lpszFileHash
84+
参数.六：lpszFileHash
8085
In/Out：In
8186
类型：常量字符指针
8287
可空：Y
@@ -86,7 +91,7 @@ extern "C" BOOL Database_Help_Insert(TCHAR* ptszSQLBuffer, XSTORAGECORE_DBFILE*
8691
意思：是否成功
8792
备注：
8893
*********************************************************************/
89-
extern "C" BOOL Database_Help_Delete(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);
94+
extern "C" BOOL Database_Help_Delete(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);
9095
/********************************************************************
9196
函数名称：Database_Help_Query
9297
函数功能：数据库查询打包函数
@@ -180,12 +185,17 @@ extern "C" BOOL Database_File_Destory();
180185
类型：数据结构指针
181186
可空：N
182187
意思：要插入的数据信息
188+
参数.二：bRewrite
189+
In/Out：In
190+
类型：逻辑型
191+
可空：N
192+
意思：是否覆写数据
183193
返回值
184194
类型：逻辑型
185195
意思：是否成功
186196
备注：这个结构所有值都必须填充
187197
*********************************************************************/
188-
extern "C" BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage);
198+
extern "C" BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage, BOOL bRewrite = FALSE);
189199
/********************************************************************
190200
函数名称：Database_File_FileDelete
191201
函数功能：删除一个数据库文件信息
@@ -194,12 +204,17 @@ extern "C" BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage);
194204
类型：常量字符指针
195205
可空：Y
196206
意思：所属BUCK名称
197-
参数.二：lpszFile
207+
参数.二：lpszFilePath
208+
In/Out：In
209+
类型：常量字符指针
210+
可空：Y
211+
意思：要删除的文件路径
212+
参数.三：lpszFileName
198213
In/Out：In
199214
类型：常量字符指针
200215
可空：Y
201-
意思：要删除的文件全路径
202-
参数.三：lpszHash
216+
意思：要删除的文件名称
217+
参数.四：lpszHash
203218
In/Out：In
204219
类型：常量字符指针
205220
可空：Y
@@ -209,7 +224,7 @@ extern "C" BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage);
209224
意思：是否成功
210225
备注：参数不能全为空,不会删除文件
211226
*********************************************************************/
212-
extern "C" BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey = NULL, LPCSTR lpszFile = NULL, LPCSTR lpszHash = NULL);
227+
extern "C" BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCSTR lpszHash = NULL);
213228
/********************************************************************
214229
函数名称：Database_File_FileQuery
215230
函数功能：查询文件信息
@@ -238,17 +253,22 @@ extern "C" BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey = NULL, LPCSTR lpsz
238253
类型：常量字符指针
239254
可空：Y
240255
意思：查询的BUCK名
241-
参数.六：lpszFile
256+
参数.六：lpszFilePath
257+
In/Out：In
258+
类型：常量字符指针
259+
可空：Y
260+
意思：要查询的路径
261+
参数.七：lpszFileName
242262
In/Out：In
243263
类型：常量字符指针
244264
可空：Y
245265
意思：要查询的名称
246-
参数.七：lpszHash
266+
参数.八：lpszHash
247267
In/Out：In
248268
类型：常量字符指针
249269
可空：Y
250270
意思：要查询的文件HASH
251-
参数.八：lpszTableName
271+
参数.九：lpszTableName
252272
In/Out：In
253273
类型：常量字符指针
254274
可空：Y
@@ -258,4 +278,4 @@ extern "C" BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey = NULL, LPCSTR lpsz
258278
意思：是否成功
259279
备注：返回假可能没有查找到,这条记录不存在.参数lpszFile和lpszMD5不能全为空
260280
*********************************************************************/
261-
extern "C" BOOL Database_File_FileQuery(XSTORAGECORE_DBFILE * **pppSt_ListFile, int* pInt_ListCount, LPCSTR lpszTimeStart = NULL, LPCSTR lpszTimeEnd = NULL, LPCTSTR lpszBuckKey = NULL, LPCSTR lpszFile = NULL, LPCSTR lpszHash = NULL, LPCTSTR lpszTableName = NULL);
281+
extern "C" BOOL Database_File_FileQuery(XSTORAGECORE_DBFILE * **pppSt_ListFile, int* pInt_ListCount, LPCSTR lpszTimeStart = NULL, LPCSTR lpszTimeEnd = NULL, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCSTR lpszHash = NULL, LPCTSTR lpszTableName = NULL);

‎XEngine_Source/StorageModule_Database/Database_File/Database_File.cpp‎

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,24 +113,29 @@ BOOL CDatabase_File::Database_File_Destory()
113113
类型：数据结构指针
114114
可空：N
115115
意思：要插入的数据信息
116+
参数.二：bRewrite
117+
In/Out：In
118+
类型：逻辑型
119+
可空：N
120+
意思：是否覆写数据
116121
返回值
117122
类型：逻辑型
118123
意思：是否成功
119124
备注：这个结构所有值都必须填充
120125
*********************************************************************/
121-
BOOL CDatabase_File::Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBFile)
126+
BOOL CDatabase_File::Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage, BOOL bRewrite /* = FALSE */)
122127
{
123128
Database_IsErrorOccur = FALSE;
124129

125-
if (NULL == pSt_DBFile)
130+
if (NULL == pSt_DBManage)
126131
{
127132
Database_IsErrorOccur = TRUE;
128133
Database_dwErrorCode = ERROR_XENGINE_XSTROGE_CORE_DB_INSERTFILE_PARAMENT;
129134
return FALSE;
130135
}
131136
int nListCount = 0;
132137
XSTORAGECORE_DBFILE **ppSt_ListFile;
133-
if (Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, NULL, NULL, pSt_DBFile->st_ProtocolFile.tszFileHash))
138+
if (Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, NULL, NULL, NULL, pSt_DBManage->st_ProtocolFile.tszFileHash))
134139
{
135140
BaseLib_OperatorMemory_Free((void***)&ppSt_ListFile, nListCount);
136141
return TRUE;
@@ -140,8 +145,11 @@ BOOL CDatabase_File::Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBFile)
140145
TCHAR tszSQLStatement[2048];
141146
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
142147

143-
Database_Help_Insert(tszSQLStatement, pSt_DBFile);
144-
148+
if (bRewrite)
149+
{
150+
Database_File_FileDelete(pSt_DBManage->tszBuckKey, pSt_DBManage->st_ProtocolFile.tszFilePath, pSt_DBManage->st_ProtocolFile.tszFileName);
151+
}
152+
Database_Help_Insert(tszSQLStatement, pSt_DBManage);
145153
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
146154
{
147155
Database_IsErrorOccur = TRUE;
@@ -158,11 +166,16 @@ BOOL CDatabase_File::Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBFile)
158166
类型：常量字符指针
159167
可空：Y
160168
意思：所属BUCK名称
161-
参数.二：lpszFile
169+
参数.二：lpszFilePath
162170
In/Out：In
163171
类型：常量字符指针
164172
可空：Y
165-
意思：要删除的文件全路径
173+
意思：要删除的文件路径
174+
参数.三：lpszFileName
175+
In/Out：In
176+
类型：常量字符指针
177+
可空：Y
178+
意思：要删除的文件名称
166179
参数.三：lpszHash
167180
In/Out：In
168181
类型：常量字符指针
@@ -173,19 +186,19 @@ BOOL CDatabase_File::Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBFile)
173186
意思：是否成功
174187
备注：参数不能全为空,不会删除文件
175188
*********************************************************************/
176-
BOOL CDatabase_File::Database_File_FileDelete(LPCTSTR lpszBuckKey /* = NULL */, LPCTSTR lpszFile /* = NULL */, LPCTSTR lpszHash /* = NULL */)
189+
BOOL CDatabase_File::Database_File_FileDelete(LPCTSTR lpszBuckKey /* = NULL */, LPCTSTR lpszFilePath /* = NULL */, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszHash /* = NULL */)
177190
{
178191
Database_IsErrorOccur = FALSE;
179192

180-
if ((NULL == lpszFile) && (NULL == lpszHash))
193+
if ((NULL == lpszFileName) && (NULL == lpszHash))
181194
{
182195
Database_IsErrorOccur = TRUE;
183196
Database_dwErrorCode = ERROR_XENGINE_XSTROGE_CORE_DB_DELETEFILE_PARAMENT;
184197
return FALSE;
185198
}
186199
int nListCount = 0;
187200
XSTORAGECORE_DBFILE **ppSt_ListFile;
188-
if (!Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, lpszBuckKey, lpszFile, lpszHash))
201+
if (!Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, lpszBuckKey, lpszFilePath, lpszFileName, lpszHash))
189202
{
190203
return FALSE;
191204
}
@@ -194,7 +207,7 @@ BOOL CDatabase_File::Database_File_FileDelete(LPCTSTR lpszBuckKey /* = NULL */,
194207
{
195208
TCHAR tszSQLStatement[1024];
196209
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
197-
Database_Help_Delete(tszSQLStatement, ppSt_ListFile[i]->tszTableName, lpszBuckKey, lpszFile, lpszHash);
210+
Database_Help_Delete(tszSQLStatement, ppSt_ListFile[i]->tszTableName, lpszBuckKey, lpszFilePath, lpszFileName, lpszHash);
198211

199212
if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
200213
{
@@ -234,17 +247,22 @@ BOOL CDatabase_File::Database_File_FileDelete(LPCTSTR lpszBuckKey /* = NULL */,
234247
类型：常量字符指针
235248
可空：Y
236249
意思：查询的BUCK名
237-
参数.六：lpszFile
250+
参数.六：lpszFilePath
251+
In/Out：In
252+
类型：常量字符指针
253+
可空：Y
254+
意思：要查询的路径
255+
参数.七：lpszFileName
238256
In/Out：In
239257
类型：常量字符指针
240258
可空：Y
241259
意思：要查询的名称
242-
参数.七：lpszHash
260+
参数.八：lpszHash
243261
In/Out：In
244262
类型：常量字符指针
245263
可空：Y
246264
意思：要查询的文件HASH
247-
参数.八：lpszTableName
265+
参数.九：lpszTableName
248266
In/Out：In
249267
类型：常量字符指针
250268
可空：Y
@@ -254,11 +272,11 @@ BOOL CDatabase_File::Database_File_FileDelete(LPCTSTR lpszBuckKey /* = NULL */,
254272
意思：是否成功
255273
备注：返回假可能没有查找到,这条记录不存在.参数lpszFile和lpszHash不能全为空
256274
*********************************************************************/
257-
BOOL CDatabase_File::Database_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_ListFile, int* pInt_ListCount, LPCTSTR lpszTimeStart /* = NULL */, LPCTSTR lpszTimeEnd /* = NULL */, LPCTSTR lpszBuckKey /* = NULL */, LPCTSTR lpszFile /* = NULL */, LPCTSTR lpszHash /* = NULL */, LPCTSTR lpszTableName /* = NULL */)
275+
BOOL CDatabase_File::Database_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_ListFile, int* pInt_ListCount, LPCTSTR lpszTimeStart /* = NULL */, LPCTSTR lpszTimeEnd /* = NULL */, LPCTSTR lpszBuckKey /* = NULL */, LPCTSTR lpszFilePath /* = NULL */, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszHash /* = NULL */, LPCTSTR lpszTableName /* = NULL */)
258276
{
259277
Database_IsErrorOccur = FALSE;
260278

261-
if ((NULL == lpszHash) && (NULL == lpszFile))
279+
if ((NULL == lpszHash) && (NULL == lpszFileName))
262280
{
263281
Database_IsErrorOccur = TRUE;
264282
Database_dwErrorCode = ERROR_XENGINE_XSTROGE_CORE_DB_QUERYFILE_PARAMENT;
@@ -310,7 +328,7 @@ BOOL CDatabase_File::Database_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_ListFi
310328
XNETHANDLE xhResult;
311329
memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
312330

313-
Database_Help_Query(tszSQLStatement, pptszResult[0], lpszBuckKey, NULL, lpszFile, lpszHash, NULL, lpszTimeStart, lpszTimeEnd);
331+
Database_Help_Query(tszSQLStatement, pptszResult[0], lpszBuckKey, lpszFilePath, lpszFileName, lpszHash, NULL, lpszTimeStart, lpszTimeEnd);
314332
//查询文件
315333
if (DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhResult, tszSQLStatement, &dwLineResult, &dwFieldResult))
316334
{
@@ -361,7 +379,7 @@ BOOL CDatabase_File::Database_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_ListFi
361379
}
362380
else
363381
{
364-
Database_Help_Query(tszSQLStatement, lpszTableName, lpszBuckKey, NULL, lpszFile, lpszHash, NULL, lpszTimeStart, lpszTimeEnd);
382+
Database_Help_Query(tszSQLStatement, lpszTableName, lpszBuckKey, lpszFilePath, lpszFileName, lpszHash, NULL, lpszTimeStart, lpszTimeEnd);
365383
//查询文件
366384
if (DataBase_MySQL_ExecuteQuery(xhDBSQL, &xhTable, tszSQLStatement, &nllLine, &nllRow))
367385
{
@@ -562,7 +580,7 @@ BOOL CDatabase_File::Database_File_TimeDel()
562580
//删除文件
563581
int nListCount = 0;
564582
XSTORAGECORE_DBFILE **ppSt_ListFile;
565-
Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, NULL, NULL, NULL, pptszResult[0]);
583+
Database_File_FileQuery(&ppSt_ListFile, &nListCount, NULL, NULL, NULL, NULL, NULL, NULL, pptszResult[0]);
566584
for (int i = 0; i < nListCount; i++)
567585
{
568586
//删除文件

‎XEngine_Source/StorageModule_Database/Database_File/Database_File.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class CDatabase_File
1919
public:
2020
BOOL Database_File_Init(DATABASE_MYSQL_CONNECTINFO* pSt_DBConnector, int nTimeMonth = 1);
2121
BOOL Database_File_Destory();
22-
BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage);
23-
BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFile = NULL, LPCTSTR lpszHash = NULL);
24-
BOOL Database_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_ListFile, int* pInt_ListCount, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFile = NULL, LPCTSTR lpszHash = NULL, LPCTSTR lpszTableName = NULL);
22+
BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE *pSt_DBManage, BOOL bRewrite = FALSE);
23+
BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszHash = NULL);
24+
BOOL Database_File_FileQuery(XSTORAGECORE_DBFILE*** pppSt_ListFile, int* pInt_ListCount, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszHash = NULL, LPCTSTR lpszTableName = NULL);
2525
protected:
2626
BOOL Database_File_CreateTable();
2727
BOOL Database_File_TimeMonth(LPCTSTR lpszStartTime, int* pInt_Month);

‎XEngine_Source/StorageModule_Database/Database_Help/Database_Help.cpp‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,17 @@ BOOL CDatabase_Help::Database_Help_Insert(TCHAR* ptszSQLBuffer, XSTORAGECORE_DBF
8080
类型：常量字符指针
8181
可空：Y
8282
意思：输入BUCKET名
83-
参数.四：lpszFileName
83+
参数.四：lpszFilePath
84+
In/Out：In
85+
类型：常量字符指针
86+
可空：Y
87+
意思：输入文件路径
88+
参数.五：lpszFileName
8489
In/Out：In
8590
类型：常量字符指针
8691
可空：Y
8792
意思：输入文件名称
88-
参数.五：lpszFileHash
93+
参数.六：lpszFileHash
8994
In/Out：In
9095
类型：常量字符指针
9196
可空：Y
@@ -95,14 +100,14 @@ BOOL CDatabase_Help::Database_Help_Insert(TCHAR* ptszSQLBuffer, XSTORAGECORE_DBF
95100
意思：是否成功
96101
备注：
97102
*********************************************************************/
98-
BOOL CDatabase_Help::Database_Help_Delete(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey /* = NULL */, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszFileHash /* = NULL */)
103+
BOOL CDatabase_Help::Database_Help_Delete(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey /* = NULL */, LPCTSTR lpszFilePath /* = NULL */, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszFileHash /* = NULL */)
99104
{
100105
Database_IsErrorOccur = FALSE;
101106

102107
TCHAR tszSQLQuery[1024];
103108
memset(tszSQLQuery, '\0', sizeof(tszSQLQuery));
104109

105-
Database_Help_Packet(tszSQLQuery, lpszBuckKey, NULL, lpszFileName, lpszFileHash);
110+
Database_Help_Packet(tszSQLQuery, lpszBuckKey, lpszFilePath, lpszFileName, lpszFileHash);
106111
_stprintf(ptszSQLBuffer, _T("DELETE FROM `%s` %s"), lpszTableName, tszSQLQuery);
107112
return TRUE;
108113
}

‎XEngine_Source/StorageModule_Database/Database_Help/Database_Help.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CDatabase_Help
1818
~CDatabase_Help();
1919
public:
2020
BOOL Database_Help_Insert(TCHAR* ptszSQLBuffer, XSTORAGECORE_DBFILE* pSt_DBFile);
21-
BOOL Database_Help_Delete(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);
21+
BOOL Database_Help_Delete(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);
2222
BOOL Database_Help_Query(TCHAR* ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL, LPCTSTR lpszFileUser = NULL, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL);
2323
protected:
2424
BOOL Database_Help_Packet(TCHAR* ptszSQLBuffer, LPCTSTR lpszBuckKey = NULL, LPCTSTR lpszFilePath = NULL, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL, LPCTSTR lpszFileUser = NULL, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL);

‎XEngine_Source/StorageModule_Database/pch.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ extern "C" BOOL Database_Help_Insert(TCHAR * ptszSQLBuffer, XSTORAGECORE_DBFILE
3535
{
3636
return m_SQLHelp.Database_Help_Insert(ptszSQLBuffer, pSt_DBFile);
3737
}
38-
extern "C" BOOL Database_Help_Delete(TCHAR * ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey, LPCTSTR lpszFileName, LPCTSTR lpszFileHash)
38+
extern "C" BOOL Database_Help_Delete(TCHAR * ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey, LPCTSTR lpszFilePath, LPCTSTR lpszFileName, LPCTSTR lpszFileHash)
3939
{
40-
return m_SQLHelp.Database_Help_Delete(ptszSQLBuffer, lpszTableName, lpszBuckKey, lpszFileName, lpszFileHash);
40+
return m_SQLHelp.Database_Help_Delete(ptszSQLBuffer, lpszTableName, lpszBuckKey, lpszFilePath, lpszFileName, lpszFileHash);
4141
}
4242
extern "C" BOOL Database_Help_Query(TCHAR * ptszSQLBuffer, LPCTSTR lpszTableName, LPCTSTR lpszBuckKey, LPCTSTR lpszFilePath, LPCTSTR lpszFileName, LPCTSTR lpszFileHash, LPCTSTR lpszFileUser, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
4343
{
@@ -54,15 +54,15 @@ extern "C" BOOL Database_File_Destory()
5454
{
5555
return m_SQLFile.Database_File_Destory();
5656
}
57-
extern "C" BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE * pSt_DBManage)
57+
extern "C" BOOL Database_File_FileInsert(XSTORAGECORE_DBFILE * pSt_DBManage, BOOL bRewrite)
5858
{
59-
return m_SQLFile.Database_File_FileInsert(pSt_DBManage);
59+
return m_SQLFile.Database_File_FileInsert(pSt_DBManage, bRewrite);
6060
}
61-
extern "C" BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey, LPCTSTR lpszFile, LPCTSTR lpszHash)
61+
extern "C" BOOL Database_File_FileDelete(LPCTSTR lpszBuckKey, LPCTSTR lpszFilePath, LPCTSTR lpszFileName, LPCTSTR lpszHash)
6262
{
63-
return m_SQLFile.Database_File_FileDelete(lpszBuckKey, lpszFile, lpszHash);
63+
return m_SQLFile.Database_File_FileDelete(lpszBuckKey, lpszFilePath, lpszFileName, lpszHash);
6464
}
65-
extern "C" BOOL Database_File_FileQuery(XSTORAGECORE_DBFILE * **pppSt_ListFile, int* pInt_ListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd, LPCTSTR lpszBuckKey, LPCTSTR lpszFile, LPCTSTR lpszHash, LPCTSTR lpszTableName)
65+
extern "C" BOOL Database_File_FileQuery(XSTORAGECORE_DBFILE * **pppSt_ListFile, int* pInt_ListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd, LPCTSTR lpszBuckKey, LPCTSTR lpszFilePath, LPCTSTR lpszFileName, LPCTSTR lpszHash, LPCTSTR lpszTableName)
6666
{
67-
return m_SQLFile.Database_File_FileQuery(pppSt_ListFile, pInt_ListCount, lpszTimeStart, lpszTimeEnd, lpszBuckKey, lpszFile, lpszHash, lpszTableName);
67+
return m_SQLFile.Database_File_FileQuery(pppSt_ListFile, pInt_ListCount, lpszTimeStart, lpszTimeEnd, lpszBuckKey, lpszFilePath, lpszFileName, lpszHash, lpszTableName);
6868
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
257257
}
258258
SystemApi_File_CreateMutilFolder(tszTmpPath);
259259
}
260-
if (!Session_UPStroage_Insert(lpszClientAddr, st_StorageBucket.tszBuckKey, tszFileDir, nPosCount, nPosStart, nPosEnd))
260+
if (!Session_UPStroage_Insert(lpszClientAddr, st_StorageBucket.tszBuckKey, tszFileDir, nPosCount, st_StorageBucket.st_PermissionFlags.bRewrite, nPosStart, nPosEnd))
261261
{
262262
st_HDRParam.bIsClose = TRUE;
263263
st_HDRParam.nHttpCode = 404;
@@ -329,7 +329,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
329329
Protocol_StoragePacket_UPDown(tszPassNotify, &nPLen, st_StorageInfo.tszBuckKey, st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullCount, FALSE, st_ProtocolFile.st_ProtocolFile.tszFileHash);
330330
if (st_ServiceCfg.st_XSql.bEnable)
331331
{
332-
if (Database_File_FileInsert(&st_ProtocolFile))
332+
if (Database_File_FileInsert(&st_ProtocolFile, st_StorageInfo.bRewrite))
333333
{
334334
st_HDRParam.bIsClose = TRUE;
335335
st_HDRParam.nHttpCode = 200;

0 commit comments

Comments
 (0)