Skip to content

E
emiMobile
Commit ab9e53e1 by Mac Stephens
Options

Auto stash before merge of "WIP" and "origin/WIP"

parent d17bf35c
Showing with 13 additions and 8 deletions
emiMobileServer/Source/Api.Database.dfm
...@@ -822,8 +822,7 @@ object ApiDatabaseModule: TApiDatabaseModule ...@@ -822,8 +822,7 @@ object ApiDatabaseModule: TApiDatabaseModule
SpecificOptions.Strings = ( SpecificOptions.Strings = (
'PostgreSQL.Schema=lems, avl, entcad') 'PostgreSQL.Schema=lems, avl, entcad')
Username = 'postgres' Username = 'postgres'
Server = '192.168.102.10' Server = '192.168.74.10'
Connected = True
LoginPrompt = False LoginPrompt = False
Left = 54 Left = 54
Top = 38 Top = 38
......
emiMobileServer/Source/Common.Ini.pas
...@@ -94,10 +94,10 @@ begin ...@@ -94,10 +94,10 @@ begin
FWebClientVersionFromIni := iniFile.ValueExists('Settings', 'webClientVersion'); FWebClientVersionFromIni := iniFile.ValueExists('Settings', 'webClientVersion');
// [Database] // [Database]
FDatabaseServer := iniFile.ReadString('Database', 'Server', '192.168.102.10'); FDatabaseServer := iniFile.ReadString('Database', 'Server', '192.168.74.10');
FDatabaseServerFromIni := iniFile.ValueExists('Database', 'Server'); FDatabaseServerFromIni := iniFile.ValueExists('Database', 'Server');
FDatabasePort := iniFile.ReadInteger('Database', 'Port', 5432); FDatabasePort := iniFile.ReadInteger('Database', 'Port', 5433);
FDatabasePortFromIni := iniFile.ValueExists('Database', 'Port'); FDatabasePortFromIni := iniFile.ValueExists('Database', 'Port');
FDatabaseName := iniFile.ReadString('Database', 'Database', 'lems_wcso'); FDatabaseName := iniFile.ReadString('Database', 'Database', 'lems_wcso');
......
emiMobileServer/bin/emiMobileServer.ini
[Settings] [Settings]
LogFileNum=722 LogFileNum=725
webClientVersion=0.1.0 webClientVersion=0.1.0
[Database] [Database]
Server=192.168.102.10 --Server=192.168.102.10
Port=5432 Server=192.168.74.10
Port=5433
Database=lems_wcso Database=lems_wcso
Username=postgres Username=postgres
--Password=postgreSQL --Password=postgreSQL
......
webEMIMobile/webEmiMobile.dproj
...@@ -512,7 +512,12 @@ ...@@ -512,7 +512,12 @@
<Source> <Source>
<Source Name="MainSource">webEmiMobile.dpr</Source> <Source Name="MainSource">webEmiMobile.dpr</Source>
</Source> </Source>
<Excluded_Packages/> <Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k370.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp370.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k370.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp370.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality> </Delphi.Personality>
<Deployment Version="5"> <Deployment Version="5">
<DeployFile LocalName="Win32\Debug\webCharms.exe" Configuration="Debug" Class="ProjectOutput"/> <DeployFile LocalName="Win32\Debug\webCharms.exe" Configuration="Debug" Class="ProjectOutput"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment