#86 : ApiGetRecCount, ApiGetRecord, ApiTableInfo, makefile

Author: s-takeuchi

src/restapi/ApiGetRecCount.cpp

@@ -40,9 +40,9 @@ StkObject* ApiGetRecCount::ExecuteImpl(StkObject* ReqObj, int Method, wchar_t Ur
 	StkObject* TableNameObj = new StkObject(L"TableName");
 	StkObject* TargetTableNameObj = new StkObject(L"Name", TableNameAc);
 	DaTableName->GetTables(TableNameObj, StateMsg, Msg, 1024);
-	bool TblFound = FALSE;
+	bool TblFound = false;
 	if (TableNameObj->Contains(TargetTableNameObj) != NULL) {
-		TblFound = TRUE;
+		TblFound = true;
 	}
 	delete TargetTableNameObj;
 	delete TableNameObj;
@@ -56,7 +56,7 @@ StkObject* ApiGetRecCount::ExecuteImpl(StkObject* ReqObj, int Method, wchar_t Ur
 	// Get records
 	DbAccessor* Da = OdbcManager::GetInstance()->CreateAccessorObject(DbmsType);
 	StkObject* ColumnObj = new StkObject(L"Column");
-	int NumOfRecs = Da->GetNumOfRecords(TableNameAc, StateMsg, Msg, 1024);
+	int NumOfRecs = Da->GetNumOfRecords((SQLTCHAR*)TableNameAc, StateMsg, Msg, 1024);
 	OdbcManager::GetInstance()->DeleteAccessorObject(Da);
 
 	StkObject* DataObj = new StkObject(L"Data");

src/restapi/ApiGetRecord.cpp

@@ -77,9 +77,9 @@ StkObject* ApiGetRecord::ExecuteImpl(StkObject* ReqObj, int Method, wchar_t UrlP
 	StkObject* TableNameObj = new StkObject(L"TableName");
 	StkObject* TargetTableNameObj = new StkObject(L"Name", TableNameAc);
 	DaTableName->GetTables(TableNameObj, StateMsg, Msg, 1024);
-	bool TblFound = FALSE;
+	bool TblFound = false;
 	if (TableNameObj->Contains(TargetTableNameObj) != NULL) {
-		TblFound = TRUE;
+		TblFound = true;
 	}
 	delete TargetTableNameObj;
 	delete TableNameObj;
@@ -96,7 +96,7 @@ StkObject* ApiGetRecord::ExecuteImpl(StkObject* ReqObj, int Method, wchar_t UrlP
 	int NumOfCols = Da->GetColumnInfoByTableName((SQLTCHAR*)TableNameAc, ColumnObj, StateMsg, Msg, 1024);
 	delete ColumnObj;
 	StkObject* DatObj = new StkObject(L"Data");
-	int NumOfRecs = Da->GetRecordsByTableName(TableNameAc, NumOfCols, DatObj, SortColumnNameAc, SortOrder, LimitInt, OffsetInt, StateMsg, Msg, 1024);
+	int NumOfRecs = Da->GetRecordsByTableName((SQLTCHAR*)TableNameAc, NumOfCols, DatObj, SortColumnNameAc, SortOrder, LimitInt, OffsetInt, StateMsg, Msg, 1024);
 	OdbcManager::GetInstance()->DeleteAccessorObject(Da);
 
 	if (SortColumnNameAc != NULL && *SortColumnNameAc != L'\0') {

src/restapi/ApiGetTableInfo.cpp

@@ -33,7 +33,7 @@ StkObject* ApiGetTableInfo::ExecuteImpl(StkObject* ReqObj, int Method, wchar_t U
 	DbAccessor* Da = OdbcManager::GetInstance()->CreateAccessorObject(DbmsType);
 	Da->GetTables(DatObj, StateMsg, Msg, 1024);
 
-	if (lstrcmp(TableName, L"") != 0) {
+	if (StkPlWcsCmp(TableName, L"") != 0) {
 		wchar_t TableNameAc[768];
 		DecodeURL(TableName, 768, TableNameAc, 768);
 
@@ -46,7 +46,7 @@ StkObject* ApiGetTableInfo::ExecuteImpl(StkObject* ReqObj, int Method, wchar_t U
 			StkObject* DatObj2 = new StkObject(L"Data");
 			DatObj2->AppendChildElement(TblInfObj);
 
-			Da->GetColumnInfoByTableName(TableNameAc, TblInfObj, StateMsg, Msg, 1024);
+			Da->GetColumnInfoByTableName((SQLTCHAR*)TableNameAc, TblInfObj, StateMsg, Msg, 1024);
 
 			*ResultCode = 200;
 			AddCodeAndMsg(ResObj, 0, L"", L"");

src/restapi/makefile

@@ -1,7 +1,7 @@
 LDFLAGS = -L/usr/local/lib64 -L/usr/local/lib
 LIBS    = -lssl -lcrypto -lstdc++
 
-sample : CmdFreakRestApi.o MyMsgProc.o dataaccess.o ApiGetSystem.o
+sample : CmdFreakRestApi.o MyMsgProc.o dataaccess.o ApiGetSystem.o ApiGetRecCount.o ApiGetRecord.o ApiGetTableInfo.o
 	cd ../../../YaizuComLib/src/stkpl; make
 	cp ../../../YaizuComLib/src/stkpl/stkpl.a .
 	cd ../../../YaizuComLib/src/stkwebapp; make
@@ -17,7 +17,7 @@ sample : CmdFreakRestApi.o MyMsgProc.o dataaccess.o ApiGetSystem.o
 	cd ../../../YaizuComLib/src/stkdata; make
 	cp ../../../YaizuComLib/src/stkdata/stkdata.a .
 
-	g++ -o sample CmdFreakRestApi.o MyMsgProc.o dataaccess.o ApiGetSystem.o stkpl.a stkwebapp.a stkwebapp_um.a commonfunc.a stksocket.a stkthread.a stkdata.a -std=c++1z -lstdc++fs -pthread -static-libgcc $(LDFLAGS) $(LIBS)
+	g++ -o sample CmdFreakRestApi.o MyMsgProc.o dataaccess.o ApiGetSystem.o  ApiGetRecCount.o ApiGetRecord.o ApiGetTableInfo.o stkpl.a stkwebapp.a stkwebapp_um.a commonfunc.a stksocket.a stkthread.a stkdata.a -std=c++1z -lstdc++fs -pthread -static-libgcc $(LDFLAGS) $(LIBS)
 
 CmdFreakRestApi.o : CmdFreakRestApi.cpp
 	g++ -c CmdFreakRestApi.cpp -std=c++1z
@@ -31,6 +31,15 @@ dataaccess.o : dataaccess.cpp
 ApiGetSystem.o : ApiGetSystem.cpp
 	g++ -c ApiGetSystem.cpp -std=c++1z
 
+ApiGetRecCount.o : ApiGetRecCount.cpp
+	g++ -c ApiGetRecCount.cpp -std=c++1z
+
+ApiGetRecord.o : ApiGetRecord.cpp
+	g++ -c ApiGetRecord.cpp -std=c++1z
+
+ApiGetTableInfo.o : ApiGetTableInfo.cpp
+	g++ -c ApiGetTableInfo.cpp -std=c++1z
+
 clean :
 	rm -f *.o *.a sample
 	cd ../../../YaizuComLib/src/stkpl; make clean