Completed some more work on FilePlayerDAO and Created a PlayerGL object which uses...

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@510 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv-2.0/GameServ.sln b/gameserv-2.0/GameServ.sln
index b4f6da9c7de81156fd9abb9cc08c816f302ade4b..f4513774159af90ac01828a6b05e92781c303ab4 100644 (file)
--- a/gameserv-2.0/GameServ.sln
+++ b/gameserv-2.0/GameServ.sln
@@ -8,6 +8,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgameservgldl", "libgames
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgameservcore", "libgameservcore\libgameservcore.vcproj", "{279AA91C-8638-45E5-AAA3-988F74764A97}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdriver", "testdriver\testdriver.vcproj", "{9DAAD910-02AF-431F-88F2-08434ECB5102}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {279AA91C-8638-45E5-AAA3-988F74764A97} = {279AA91C-8638-45E5-AAA3-988F74764A97}\r
+               {3CED9BD5-BEAA-4C36-A735-AFF2B3F2CF42} = {3CED9BD5-BEAA-4C36-A735-AFF2B3F2CF42}\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -22,6 +28,10 @@ Global
                {279AA91C-8638-45E5-AAA3-988F74764A97}.Debug|Win32.Build.0 = Debug|Win32\r
                {279AA91C-8638-45E5-AAA3-988F74764A97}.Release|Win32.ActiveCfg = Release|Win32\r
                {279AA91C-8638-45E5-AAA3-988F74764A97}.Release|Win32.Build.0 = Release|Win32\r
+               {9DAAD910-02AF-431F-88F2-08434ECB5102}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {9DAAD910-02AF-431F-88F2-08434ECB5102}.Debug|Win32.Build.0 = Debug|Win32\r
+               {9DAAD910-02AF-431F-88F2-08434ECB5102}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9DAAD910-02AF-431F-88F2-08434ECB5102}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h
index 391c8d7d20ed7a65ee5d61815ac7d9517296c3d7..d71fcd0e320e9f96a44bd4a36f1e9650c948b6e5 100644 (file)
--- a/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/DataLayer/IPlayerDAO.h
@@ -7,8 +7,6 @@ using GameServ::GameLayer::GameObjects::PlayerGO;
 #include <boost/shared_ptr.hpp>\r
 using boost::shared_ptr;\r
 \r
-#include <vector>\r
-using std::vector;\r
 #include <list>\r
 using std::list;\r
 #include <string>\r

diff --git a/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/PlayerGL.h b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/PlayerGL.h
new file mode 100644 (file)
index 0000000..60e74cb
--- /dev/null
+++ b/gameserv-2.0/libgameservgldl/include/GameServ/GameLayer/PlayerGL.h
@@ -0,0 +1,32 @@
+#ifndef __GS__PLAYERGL_H__\r
+#define __GS__PLAYERGL_H__\r
+\r
+#include <GameServ/DataLayer/IPlayerDAO.h>\r
+using GameServ::DataLayer::DataAccessObjects::IPlayerDAO;\r
+\r
+#include <boost/shared_ptr.hpp>\r
+using boost::shared_ptr;\r
+\r
+#include <list>\r
+using std::list;\r
+#include <string>\r
+using std::string;\r
+namespace GameServ { namespace GameLayer {\r
+\r
+class PlayerGL\r
+{\r
+public:\r
+       PlayerGL();\r
+       ~PlayerGL();\r
+\r
+       shared_ptr<PlayerGO> GetById(const string &Id);\r
+       void Insert(shared_ptr<PlayerGO> spPlayer);\r
+       \r
+private:\r
+       void Initialize();\r
+       shared_ptr<IPlayerDAO> mspPlayerDAO;\r
+};\r
+\r
+}}\r
+\r
+#endif
\ No newline at end of file

diff --git a/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj b/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
index db59a533cbd113459a81930cc14f426f9e7428ef..38e062c5a324e1eeec714680aaf52c30c55523be 100644 (file)
--- a/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
+++ b/gameserv-2.0/libgameservgldl/libgameservgldl.vcproj
@@ -174,6 +174,10 @@
                                RelativePath=".\include\GameServ\DataLayer\IDAOFactory.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\DataLayer\IPlayerDAO.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\GameServ\DataLayer\IPlayerDAO.h"\r
                                >\r
@@ -202,6 +206,14 @@
                <Filter\r
                        Name="GameLayer"\r
                        >\r
+                       <File\r
+                               RelativePath=".\src\GameLayer\PlayerGL.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\GameServ\GameLayer\PlayerGL.h"\r
+                               >\r
+                       </File>\r
                        <Filter\r
                                Name="GameObjects"\r
                                >\r

diff --git a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
index e3b56be8c160e28814b774fdff1dc0abe63fd1ad..59e6e64755d86b1a0ebee0b3a2592e715178f87c 100644 (file)
--- a/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
+++ b/gameserv-2.0/libgameservgldl/src/DataLayer/File/FilePlayerDAO.cpp
@@ -117,4 +117,23 @@ void FilePlayerDAO::SetFlags(shared_ptr<PlayerGO> spPlayer, const int &flags) co
 \r
 }\r
 \r
+void FilePlayerDAO::Update(shared_ptr<PlayerGO> spPlayer)\r
+{\r
+       throw DataLayerException("Undefined Function", __FILE__, __LINE__);\r
+}\r
+\r
+void FilePlayerDAO::Insert(shared_ptr<PlayerGO> spPlayer)\r
+{\r
+       throw DataLayerException("Undefined Function", __FILE__, __LINE__);\r
+}\r
 \r
+bool FilePlayerDAO::IdExists(const string &Id) const\r
+{\r
+       throw DataLayerException("Undefined Function", __FILE__, __LINE__);\r
+       return false;\r
+}\r
+\r
+list<string> FilePlayerDAO::GetIdsByName(const string &Name) const\r
+{\r
+       throw DataLayerException("Undefined Function", __FILE__, __LINE__);\r
+}
\ No newline at end of file

diff --git a/gameserv-2.0/libgameservgldl/src/DataLayer/IPlayerDAO.cpp b/gameserv-2.0/libgameservgldl/src/DataLayer/IPlayerDAO.cpp
new file mode 100644 (file)
index 0000000..70408f0
--- /dev/null
+++ b/gameserv-2.0/libgameservgldl/src/DataLayer/IPlayerDAO.cpp
@@ -0,0 +1,10 @@
+#include <GameServ/DataLayer/IPlayerDAO.h>\r
+using GameServ::DataLayer::DataAccessObjects::IPlayerDAO;\r
+\r
+IPlayerDAO::IPlayerDAO()\r
+{\r
+}\r
+\r
+IPlayerDAO::~IPlayerDAO()\r
+{\r
+}
\ No newline at end of file

diff --git a/gameserv-2.0/libgameservgldl/src/GameLayer/PlayerGL.cpp b/gameserv-2.0/libgameservgldl/src/GameLayer/PlayerGL.cpp
new file mode 100644 (file)
index 0000000..d16dd55
--- /dev/null
+++ b/gameserv-2.0/libgameservgldl/src/GameLayer/PlayerGL.cpp
@@ -0,0 +1,38 @@
+#include <GameServ/GameLayer/PlayerGL.h>\r
+using GameServ::GameLayer::PlayerGL;\r
+\r
+#include <GameServ/DataLayer/DataAccess.h>\r
+using GameServ::DataLayer::DataAccess;\r
+#include <GameServ/DataLayer/IDAOFactory.h>\r
+using GameServ::DataLayer::IDAOFactory;\r
+\r
+PlayerGL::PlayerGL()\r
+{\r
+       Initialize();\r
+}\r
+\r
+PlayerGL::~PlayerGL()\r
+{\r
+       mspPlayerDAO = shared_ptr<IPlayerDAO>();\r
+}\r
+\r
+void PlayerGL::Initialize()\r
+{\r
+       shared_ptr<IDAOFactory> spDAOFactory;\r
+       // TODO: Hard coded for now for POC. Get from a config file\r
+       spDAOFactory = shared_ptr<IDAOFactory>(DataAccess::GetDataAccessFactory("File"));\r
+       mspPlayerDAO = spDAOFactory->GetPlayerDAO();\r
+\r
+}\r
+\r
+shared_ptr<PlayerGO> PlayerGL::GetById(const string &Id)\r
+{\r
+       assert(!Id.empty());\r
+       return mspPlayerDAO->GetById(Id);\r
+}\r
+\r
+void PlayerGL::Insert(shared_ptr<PlayerGO> spPlayer)\r
+{\r
+       assert(spPlayer != 0);\r
+       mspPlayerDAO->Insert(spPlayer);\r
+}
\ No newline at end of file

diff --git a/gameserv-2.0/testdriver/main.cpp b/gameserv-2.0/testdriver/main.cpp
new file mode 100644 (file)
index 0000000..1b57d2a
--- /dev/null
+++ b/gameserv-2.0/testdriver/main.cpp
@@ -0,0 +1,13 @@
+#include <iostream>\r
+using namespace std;\r
+#include <GameServ/GameLayer/GameObjects/PlayerGO.h>\r
+using GameServ::GameLayer::GameObjects::PlayerGO;\r
+#include <GameServ/GameLayer/PlayerGL.h>\r
+using GameServ::GameLayer::PlayerGL;\r
+\r
+int main()\r
+{\r
+       PlayerGL pgl;\r
+       shared_ptr<PlayerGO> spPlayer = pgl.GetById("1");\r
+       return 0;\r
+}\r

diff --git a/gameserv-2.0/testdriver/testdriver.vcproj b/gameserv-2.0/testdriver/testdriver.vcproj
new file mode 100644 (file)
index 0000000..0a2ba01
--- /dev/null
+++ b/gameserv-2.0/testdriver/testdriver.vcproj
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="testdriver"\r
+       ProjectGUID="{9DAAD910-02AF-431F-88F2-08434ECB5102}"\r
+       RootNamespace="testdriver"\r
+       TargetFrameworkVersion="196613"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(SolutionDir)/libgameservgldl/include;$(SolutionDir)/libgameservcore/include"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath=".\main.cpp"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r