Skip to content
Snippets Groups Projects
Commit c3b18101 authored by Demian Katz's avatar Demian Katz
Browse files

Added missing comments; do not warn about missing Sample.ini file (no such thing).

parent b6cf0f2e
Branches
Tags
No related merge requests found
...@@ -40,14 +40,67 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Config\Writer as ConfigWriter, ...@@ -40,14 +40,67 @@ use VuFind\Config\Reader as ConfigReader, VuFind\Config\Writer as ConfigWriter,
*/ */
class Upgrade class Upgrade
{ {
/**
* Version we're upgrading from
*
* @var string
*/
protected $from; protected $from;
/**
* Version we're upgrading to
*
* @var string
*/
protected $to; protected $to;
/**
* Directory containing configurations to upgrade
*
* @var string
*/
protected $oldDir; protected $oldDir;
/**
* Directory containing unmodified new configurations
*
* @var string
*/
protected $rawDir; protected $rawDir;
/**
* Directory where new configurations should be written (null for test mode)
*
* @var string
*/
protected $newDir; protected $newDir;
/**
* Parsed old configurations
*
* @var array
*/
protected $oldConfigs = array(); protected $oldConfigs = array();
/**
* Processed new configurations
*
* @var array
*/
protected $newConfigs = array(); protected $newConfigs = array();
/**
* Comments parsed from configuration files
*
* @var array
*/
protected $comments = array(); protected $comments = array();
/**
* Warnings generated during upgrade process
*
* @var array
*/
protected $warnings = array(); protected $warnings = array();
/** /**
...@@ -749,6 +802,8 @@ class Upgrade ...@@ -749,6 +802,8 @@ class Upgrade
? $this->newConfigs['config.ini']['Catalog']['driver'] : ''; ? $this->newConfigs['config.ini']['Catalog']['driver'] : '';
if (empty($driver)) { if (empty($driver)) {
$this->addWarning("WARNING: Could not find ILS driver setting."); $this->addWarning("WARNING: Could not find ILS driver setting.");
} else if ('Sample' == $driver) {
// No configuration file for Sample driver
} else if (!file_exists($this->oldDir . '/' . $driver . '.ini')) { } else if (!file_exists($this->oldDir . '/' . $driver . '.ini')) {
$this->addWarning( $this->addWarning(
"WARNING: Could not find {$driver}.ini file; " "WARNING: Could not find {$driver}.ini file; "
......
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