diff --git a/build/linux/HGWebService/HGWebService.cbp b/build/linux/HGWebService/HGWebService.cbp
index ababfd4d..1b5fe9ab 100644
--- a/build/linux/HGWebService/HGWebService.cbp
+++ b/build/linux/HGWebService/HGWebService.cbp
@@ -288,6 +288,7 @@
+
@@ -325,6 +326,11 @@
+
+
+
+
+
diff --git a/sdk/webservice/ManagerV2.cpp b/sdk/webservice/ManagerV2.cpp
index 2a1f0c4a..82e328d6 100644
--- a/sdk/webservice/ManagerV2.cpp
+++ b/sdk/webservice/ManagerV2.cpp
@@ -112,8 +112,8 @@ namespace ver_2
assert(0 == ret);
}
- std::vector> tables;
-
+ std::vector > tables;
+
char** result = NULL;
int rows, cols;
ret = sqlite3_get_table(m_sqlite, "select * from table_", &result, &rows, &cols, NULL);
@@ -234,7 +234,7 @@ namespace ver_2
if ((mask & GlobalConfig::imageTiffJpegQualityMask) && (cfg.imageTiffJpegQuality < 0 || cfg.imageTiffJpegQuality > 100))
return -1;
- HGBase_EnterLock(m_lock);
+ HGBase_EnterLock(m_lock);
if (mask & GlobalConfig::fileSavePathMask)
{
std::string fileSavePath = cfg.fileSavePath;
@@ -248,7 +248,7 @@ namespace ver_2
{
m_globalCfg.fileNamePrefix = cfg.fileNamePrefix;
SetCfgStringValue("global", "fileNamePrefix", m_globalCfg.fileNamePrefix);
- }
+ }
if (mask & GlobalConfig::fileNameModeMask)
{
m_globalCfg.fileNameMode = cfg.fileNameMode;
@@ -1049,7 +1049,7 @@ namespace ver_2
if (NULL == m_sqlite)
return -1;
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
int rows, cols;
@@ -1412,7 +1412,7 @@ namespace ver_2
return -1;
}
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -1469,14 +1469,14 @@ namespace ver_2
{
if (tables[i].second >= insertPos)
{
- sprintf(sql, "update 'table_%s' set idx = '%d' where id = '%d'",
+ sprintf(sql, "update 'table_%s' set idx = '%d' where id = '%d'",
m_currBatchId.c_str(), tables[i].second + 1, tables[i].first);
ret = sqlite3_exec(m_sqlite, sql, NULL, NULL, NULL);
assert(0 == ret);
}
}
- sprintf(sql, "insert into 'table_%s' (idx, format, tag, image, thumb) values ('%d', '%s', '%s', ?, ?)", m_currBatchId.c_str(),
+ sprintf(sql, "insert into 'table_%s' (idx, format, tag, image, thumb) values ('%d', '%s', '%s', ?, ?)", m_currBatchId.c_str(),
insertPos, imgFormat.c_str(), imageTag.c_str());
sqlite3_stmt* stmt = NULL;
ret = sqlite3_prepare(m_sqlite, sql, -1, &stmt, NULL);
@@ -1516,7 +1516,7 @@ namespace ver_2
return -1;
}
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -1602,12 +1602,12 @@ namespace ver_2
int ManagerV2::ModifyImageTag(const std::vector& imageIndexList, const std::vector& imageTagList, std::string& errInfo)
{
errInfo = "错误";
-
+
if (NULL == m_sqlite || imageIndexList.empty() || imageTagList.empty()
|| imageIndexList.size() != imageTagList.size())
return -1;
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -1662,7 +1662,7 @@ namespace ver_2
for (int i = 0; i < (int)imageIndexList.size(); ++i)
{
- sprintf(sql, "update 'table_%s' set tag = '%s' where idx = '%d'", m_currBatchId.c_str(),
+ sprintf(sql, "update 'table_%s' set tag = '%s' where idx = '%d'", m_currBatchId.c_str(),
imageTagList[i].c_str(), imageIndexList[i]);
ret = sqlite3_exec(m_sqlite, sql, NULL, NULL, NULL);
assert(0 == ret);
@@ -1679,7 +1679,7 @@ namespace ver_2
if (NULL == m_sqlite || imageIndexList.empty())
return -1;
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -1760,7 +1760,7 @@ namespace ver_2
{
if (value > 0)
{
- sprintf(sql, "update 'table_%s' set idx = '%d' where id = '%d'",
+ sprintf(sql, "update 'table_%s' set idx = '%d' where id = '%d'",
m_currBatchId.c_str(), tables[i].second - value, tables[i].first);
ret = sqlite3_exec(m_sqlite, sql, NULL, NULL, NULL);
assert(0 == ret);
@@ -1809,7 +1809,7 @@ namespace ver_2
return -1;
}
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -1856,7 +1856,7 @@ namespace ver_2
return -1;
}
- sprintf(sql, "update 'table_%s' set format = '%s', image = ?, thumb = ? where idx = '%d'",
+ sprintf(sql, "update 'table_%s' set format = '%s', image = ?, thumb = ? where idx = '%d'",
m_currBatchId.c_str(), imgFormat.c_str(), imageIndex);
sqlite3_stmt* stmt = NULL;
ret = sqlite3_prepare(m_sqlite, sql, -1, &stmt, NULL);
@@ -1896,7 +1896,7 @@ namespace ver_2
return -1;
}
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -1972,7 +1972,7 @@ namespace ver_2
if ("pos" != mode && "index" != mode)
return -1;
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -2064,7 +2064,7 @@ namespace ver_2
}
else
{
- std::vector> prs;
+ std::vector > prs;
for (int i = 0; i < (int)imageIndexList.size(); ++i)
{
int oldIndex = -1;
@@ -2121,7 +2121,7 @@ namespace ver_2
if (NULL == m_sqlite)
return -1;
- std::vector> tables;
+ std::vector > tables;
char** result = NULL;
char sql[256];
@@ -2151,7 +2151,7 @@ namespace ver_2
sqlite3_free_table(result);
std::sort(tables.begin(), tables.end(), BatchTableSort);
- std::list> prs1, prs2;
+ std::list > prs1, prs2;
for (int i = 0; i < (int)tables.size(); ++i)
{
std::pair pr = tables[i];
@@ -2162,7 +2162,7 @@ namespace ver_2
}
tables.clear();
- std::list>::const_iterator iter;
+ std::list >::const_iterator iter;
for (iter = prs1.begin(); iter != prs1.end(); ++iter)
tables.push_back(*iter);
for (iter = prs2.begin(); iter != prs2.end(); ++iter)