diff --git a/utils/createfolder.php b/utils/createfolder.php index 82b16d5bf..b05d0bc37 100644 --- a/utils/createfolder.php +++ b/utils/createfolder.php @@ -1,43 +1,53 @@ ] [-n ] [-s ] [-h] [-v] -F \n"; + echo " letodms-createfolder [--config ] [-c ] [-n ] [-s ] [-h] [-v] -F \n"; echo "\n"; echo "Description:\n"; echo " This program creates a new folder in LetoDMS.\n"; echo "\n"; echo "Options:\n"; - echo " -h: print usage information and exit.\n"; - echo " -v: print version and exit.\n"; + echo " -h, --help: print usage information and exit.\n"; + echo " -v, --version: print version and exit.\n"; + echo " --config: set alternative config file.\n"; echo " -F : id of parent folder\n"; echo " -c : set comment for file\n"; echo " -n : set name of the folder\n"; echo " -s : set sequence of folder\n"; } /* }}} */ +$version = "0.0.1"; $shortoptions = "F:c:s:n: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 { @@ -66,7 +76,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);