From 355484c4a78c79d676eea72269234b120ca19b64 Mon Sep 17 00:00:00 2001
From: steinm <steinm@577cc39b-cfd1-4aa2-8bc3-eda205cea05a>
Date: Thu, 21 Jul 2011 06:56:35 +0000
Subject: [PATCH] - support for long options and specifying a config file

---
 utils/adddoc.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 4814304d2..bae3df205 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -1,7 +1,7 @@
 <?php
-#ini_set('include_path', '.:/usr/share/php:/usr/share/letodms/www');
+ini_set('include_path', '.:/usr/share/php:/usr/share/letodms/www');
 
-include("/etc/letodms/conf.Settings.php");
+include("inc/inc.ClassSettings.php");
 include("LetoDMS/Core.php");
 
 function usage() { /* {{{ */
@@ -28,24 +28,33 @@ function usage() { /* {{{ */
 	echo "      what you do. If not set, the mimetype will be determined automatically.\n";
 } /* }}} */
 
+$version = "0.0.1";
 $shortoptions = "F:c:C:k:K:s:V:f:n:t:hv";
-if(false === ($options = getopt($shortoptions))) {
+$longoptions = array('help', 'version', 'config:');
+if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
 	exit(0);
 }
 
 /* Print help and exit */
-if(isset($options['h'])) {
+if(isset($options['h']) || isset($options['help'])) {
 	usage();
 	exit(0);
 }
 
 /* Print version and exit */
-if(isset($options['v'])) {
+if(isset($options['v']) || isset($options['verѕion'])) {
 	echo $version."\n";
 	exit(0);
 }
 
+/* Set alternative config file */
+if(isset($options['config'])) {
+	$settings = new Settings($options['config']);
+} else {
+	$settings = new Settings();
+}
+
 if(isset($options['F'])) {
 	$folderid = (int) $options['F'];
 } else {
@@ -117,7 +126,7 @@ $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostn
 $db->_conn->debug = 1;
 
 
-$dms = new LetoDMS_Core_DMS($db, $settings->_contentDir, $settings->_contentOffsetDir);
+$dms = new LetoDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 $dms->setRootFolderID($settings->_rootFolderID);
 $dms->setGuestID($settings->_guestID);
 $dms->setEnableGuestLogin($settings->_enableGuestLogin);