Commit e90d240affbec7c0e7ec7d98fb2c35cdcfd375a8

Authored by kevin_fourie
1 parent e5cd9828

Merged in from DEV trunk...

KTS-3055
"OpenOffice service is not being detected by Dashlets on Vista"
Fixed. Seems Vista has no alias for localhost. We need to use 127.0.0.1

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8203 c91229c3-7414-0410-bfa2-8a42b809f60b
config/config.ini
@@ -297,12 +297,12 @@ batchMigrateDocuments = default @@ -297,12 +297,12 @@ batchMigrateDocuments = default
297 luceneDirectory=${varDirectory}/indexes 297 luceneDirectory=${varDirectory}/indexes
298 298
299 ; The url for the Java Lucene Server. This should match up the the Lucene Server configuration. 299 ; The url for the Java Lucene Server. This should match up the the Lucene Server configuration.
300 -; Defaults to http://localhost:8875 300 +; Defaults to http://127.0.0.1:8875
301 javaLuceneURL = default 301 javaLuceneURL = default
302 302
303 [openoffice] 303 [openoffice]
304 ; The host on which open office is installed 304 ; The host on which open office is installed
305 -; defaults to localhost 305 +; defaults to 127.0.0.1
306 host = default 306 host = default
307 307
308 ; The port on which open office is listening 308 ; The port on which open office is listening
@@ -390,4 +390,4 @@ customerrormessages=on @@ -390,4 +390,4 @@ customerrormessages=on
390 ;name or url of custom error page 390 ;name or url of custom error page
391 customerrorpagepath=customerrorpage.php 391 customerrorpagepath=customerrorpage.php
392 ;Turn custom error handler on or off 392 ;Turn custom error handler on or off
393 -customerrorhandler=on  
394 \ No newline at end of file 393 \ No newline at end of file
  394 +customerrorhandler=on
config/dmsDefaults.php
@@ -528,9 +528,9 @@ function catchFatalErrors($p_OnOff='On'){ @@ -528,9 +528,9 @@ function catchFatalErrors($p_OnOff='On'){
528 $oKTConfig->setdefaultns('indexer', 'luceneDirectory', '${varDirectory}/indexes'); 528 $oKTConfig->setdefaultns('indexer', 'luceneDirectory', '${varDirectory}/indexes');
529 $oKTConfig->setdefaultns('indexer', 'extractorPath', '${indexingBasePath}/extractors'); 529 $oKTConfig->setdefaultns('indexer', 'extractorPath', '${indexingBasePath}/extractors');
530 $oKTConfig->setdefaultns('indexer', 'extractorHookPath', '${indexingBasePath}/extractorHooks'); 530 $oKTConfig->setdefaultns('indexer', 'extractorHookPath', '${indexingBasePath}/extractorHooks');
531 - $oKTConfig->setdefaultns('indexer', 'javaLuceneURL', 'http://localhost:8875'); 531 + $oKTConfig->setdefaultns('indexer', 'javaLuceneURL', 'http://127.0.0.1:8875');
532 532
533 - $oKTConfig->setdefaultns('openoffice', 'host', 'localhost'); 533 + $oKTConfig->setdefaultns('openoffice', 'host', '127.0.0.1');
534 $oKTConfig->setdefaultns('openoffice', 'port', 8100); 534 $oKTConfig->setdefaultns('openoffice', 'port', 8100);
535 535
536 $oKTConfig->setdefaultns('webservice', 'uploadDirectory', '${varDirectory}/uploads'); 536 $oKTConfig->setdefaultns('webservice', 'uploadDirectory', '${varDirectory}/uploads');
lib/upgrades/UpgradeFunctions.inc.php
@@ -1073,10 +1073,10 @@ class UpgradeFunctions { @@ -1073,10 +1073,10 @@ class UpgradeFunctions {
1073 $ini->addItem('indexer', 'batchDocuments', 'default', "The number of documents to be indexed in a cron session\r\n; defaults to 20"); 1073 $ini->addItem('indexer', 'batchDocuments', 'default', "The number of documents to be indexed in a cron session\r\n; defaults to 20");
1074 $ini->addItem('indexer', 'batchMigrateDocuments', 'default', "The number of documents to be migrated in a cron session\r\n; defaults to 500"); 1074 $ini->addItem('indexer', 'batchMigrateDocuments', 'default', "The number of documents to be migrated in a cron session\r\n; defaults to 500");
1075 $ini->addItem('indexer', 'luceneDirectory', '${varDirectory}/indexes', "The location of the lucene indexes"); 1075 $ini->addItem('indexer', 'luceneDirectory', '${varDirectory}/indexes', "The location of the lucene indexes");
1076 - $ini->addItem('indexer', 'javaLuceneURL', 'default', "The url for the Java Lucene Server. This should match up with the Lucene Server configuration.\r\n; defaults to http://localhost:8875"); 1076 + $ini->addItem('indexer', 'javaLuceneURL', 'default', "The url for the Java Lucene Server. This should match up with the Lucene Server configuration.\r\n; defaults to http://127.0.0.1:8875");
1077 1077
1078 // openoffice Section 1078 // openoffice Section
1079 - $ini->addItem('openoffice', 'host', 'default', "The host on which open office is installed\r\n; defaults to localhost"); 1079 + $ini->addItem('openoffice', 'host', 'default', "The host on which open office is installed\r\n; defaults to 127.0.0.1");
1080 $ini->addItem('openoffice', 'port', 'default', "The port on which open office is listening\r\n; defaults to 8100"); 1080 $ini->addItem('openoffice', 'port', 'default', "The port on which open office is listening\r\n; defaults to 8100");
1081 1081
1082 // user_prefs Section 1082 // user_prefs Section