Navigation

← Previous Changeset
Next Changeset →

Changeset 12188

Timestamp:

09/12/07 22:05:34 (1 year ago)

Author:

piotras

Message:

Replaced midgard_setup_cli with midgard_setup_ui_cli

Files:

trunk/midgard/data/midgard_setup_config.php (modified) (2 diffs)
trunk/midgard/data/midgard_setup_database.php (modified) (10 diffs)
trunk/midgard/data/midgard_setup_pear.php (modified) (18 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/midgard/data/midgard_setup_config.php

r11961	r12188
3	3	/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
4	4
5		require_once 'midgard_setup_cli.php';
	5	require_once 'midgard_setup_ui_cli.php';
6	6	require_once 'midgard_setup_log.php';
7	7
…	…
17	17	default:
18	18	midgard_setup_log::write(_("Initialize new ").__CLASS__."(cli)");
19		$this->ui =& new midgard_setup_cli();
	19	$this->ui =& new midgard_setup_ui_cli();
20	20	}
21	21

trunk/midgard/data/midgard_setup_database.php

r12161	r12188
3	3	/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 */
4	4
5		require_once 'midgard_setup_cli.php';
	5	require_once 'midgard_setup_ui_cli.php';
6	6
7	7	if(!defined('MIDGARD_SETUP_MYSQLADMIN_CMD'))
…	…
190	190	if(!isset($this->mysql_admin_name))
191	191	{
192		$value = midgard_setup_cli::get_text(_("What is MySQL admin username?"), "root");
	192	$value = midgard_setup_ui_cli::get_text(_("What is MySQL admin username?"), "root");
193	193
194	194	if(!$value && $value == '')
195	195	$value = "root";
196	196
197		midgard_setup_cli::message(
	197	midgard_setup_ui_cli::message(
198	198	_("Preparing to create database. You will be asked for password if needed."));
199	199
…	…
201	201
202	202	$value = $this->mysql_admin_name;
203		midgard_setup_cli::message(_("Preparing to create database with default admin account ") . "'{$value}'");
	203	midgard_setup_ui_cli::message(_("Preparing to create database with default admin account ") . "'{$value}'");
204	204	}
205	205
…	…
230	230	if($retval != 0)
231	231	{
232		midgard_setup_cli::error(_("Couldn't create {$this->midgard_config->database} database"));
	232	midgard_setup_ui_cli::error(_("Couldn't create {$this->midgard_config->database} database"));
233	233	}
234	234
…	…
244	244	if(!$midgard->open($_cnf_name))
245	245	{
246		midgard_setup_cli::error(_("Couldn't connect to Midgard database"));
	246	midgard_setup_ui_cli::error(_("Couldn't connect to Midgard database"));
247	247	}
248	248
…	…
250	250	if(!midgard_config::create_midgard_tables())
251	251	{
252		midgard_setup_cli::error(_("Couldn't create internal tables"));
	252	midgard_setup_ui_cli::error(_("Couldn't create internal tables"));
253	253	}
254	254
255	255	/* I am not sure how to handle errors here */
256	256	$msg = _("Creating database ") . $this->midgard_config->database . _(", please wait...");
257		midgard_setup_cli::message($msg);
	257	midgard_setup_ui_cli::message($msg);
258	258	self::update_database();
259		midgard_setup_cli::message(_("Successfully created database ") . $this->midgard_config->database);
	259	midgard_setup_ui_cli::message(_("Successfully created database ") . $this->midgard_config->database);
260	260	}
261	261
…	…
266	266	if(!is_array($_MIDGARD['schema']['types']))
267	267	{
268		midgard_setup_cli::warning(_("No midgard classes"));
	268	midgard_setup_ui_cli::warning(_("No midgard classes"));
269	269	return FALSE;
270	270	}
…	…
272	272	if(count($_MIDGARD['schema']['types']) == 0)
273	273	{
274		midgard_setup_cli::warning(_("No midgard classes"));
	274	midgard_setup_ui_cli::warning(_("No midgard classes"));
275	275	return FALSE;
276	276	}
…	…
278	278	foreach($_MIDGARD['schema']['types'] as $class_name => $val)
279	279	{
280		midgard_setup_cli::message(_("Preparing storage for: ") . "'{$class_name}'");
	280	midgard_setup_ui_cli::message(_("Preparing storage for: ") . "'{$class_name}'");
281	281	midgard_config::create_class_table($class_name);
282	282	midgard_config::update_class_table($class_name);
…	…
314	314	if($retval != 0)
315	315	{
316		midgard_setup_cli::error(_("Couldn't import sql"));
	316	midgard_setup_ui_cli::error(_("Couldn't import sql"));
317	317	}
318	318

trunk/midgard/data/midgard_setup_pear.php

r11753	r12188
15	15	require_once 'PEAR/Downloader/Package.php';
16	16	require_once 'midgard_setup_globals.php';
17		~~require_once 'midgard_setup_ui_cli_config.php';~~
18	17	require_once 'midgard_setup_log.php';
19	18
…	…
159	158
160	159	if(!$set)
161		midgard_setup_ui_cli~~_config~~::warning(_("Failed to set '{$state}' prefrred_state"));
	160	midgard_setup_ui_cli::warning(_("Failed to set '{$state}' prefrred_state"));
162	161	}
163	162
…	…
185	184	$this->midcom_static_dir, 'system');
186	185	if(!$set)
187		midgard_setup_ui_cli~~_config~~::warning(_("Failed to set '{$this->midcom_static_dir}' web_dir"));
	186	midgard_setup_ui_cli::warning(_("Failed to set '{$this->midcom_static_dir}' web_dir"));
188	187
189	188	$this->install_midcom_package('Role_Mgdschema', TRUE);
…	…
195	194
196	195	if(!$set)
197		midgard_setup_ui_cli~~_config~~::warning(_("Failed to set '{$mgdschema_dir}' mgdschema_dir"));
	196	midgard_setup_ui_cli::warning(_("Failed to set '{$mgdschema_dir}' mgdschema_dir"));
198	197
199	198	$this->install_midcom_package('Role_Midgardsql', TRUE);
…	…
205	204
206	205	if(!$set)
207		midgard_setup_ui_cli~~_config~~::warning(_("Failed to set '{$midgardsql_dir}' midgardsql_dir"));
	206	midgard_setup_ui_cli::warning(_("Failed to set '{$midgardsql_dir}' midgardsql_dir"));
208	207
209	208	$this->install_midcom_package('Role_Midgardelement', TRUE);
…	…
211	210
212	211	$mgdschema_dir = MIDGARD_SETUP_MIDGARD_PREFIX . "/share/schema";
213		midgard_setup_ui_cli~~_config~~::warning("midgard_config_file not set");
	212	midgard_setup_ui_cli::warning("midgard_config_file not set");
214	213	/*
215	214	$set = $this->pear_config->set('mgdschema_dir',
…	…
217	216
218	217	if(!$set)
219		midgard_setup_ui_cli~~_config~~::warning(_("Failed to set '{$mgdschema_dir}' mgdschema_dir")); */
	218	midgard_setup_ui_cli::warning(_("Failed to set '{$mgdschema_dir}' mgdschema_dir")); */
220	219
221	220	}
…	…
245	244	$this->pearified_channel_alias, $this->pearified_channel_base))
246	245	{
247		midgard_setup_ui_cli~~_config~~::message(_("Installing $name"));
	246	midgard_setup_ui_cli::message(_("Installing $name"));
248	247
249	248	$downld = $this->pear_downloader->download(array($pkg_name));
250	249
251	250	if(PEAR::isError($downld))
252		midgard_setup_ui_cli~~_config~~::error($downld->getMessage());
	251	midgard_setup_ui_cli::error($downld->getMessage());
253	252
254	253	$installed = $this->pear_installer->install($downld[0], $options);
255	254
256	255	if(PEAR::isError($installed))
257		midgard_setup_ui_cli~~_config~~::error($installed->getMessage());
	256	midgard_setup_ui_cli::error($installed->getMessage());
258	257
259	258	return TRUE;
…	…
261	260	} else {
262	261
263		midgard_setup_ui_cli~~_config~~::message(_("$name already installed"));
	262	midgard_setup_ui_cli::message(_("$name already installed"));
264	263	return TRUE;
265	264	}
…	…
283	282	if($this->pear_registry->packageExists($name, $this->midcom_channel))
284	283	{
285		midgard_setup_ui_cli~~_config~~::warning(_("Can not install $pkg_name package. It doesn't exists in $this->midcom_channel channel"));
	284	midgard_setup_ui_cli::warning(_("Can not install $pkg_name package. It doesn't exists in $this->midcom_channel channel"));
286	285	}
287	286	*/
…	…
293	292
294	293	if(PEAR::isError($downld))
295		midgard_setup_ui_cli~~_config~~::error($downld->getMessage());
	294	midgard_setup_ui_cli::error($downld->getMessage());
296	295
297	296	$installed = $this->pear_installer->install($downld[0], $options);
298	297
299	298	if(PEAR::isError($installed))
300		midgard_setup_ui_cli~~_config~~::error($installed->getMessage());
	299	midgard_setup_ui_cli::error($installed->getMessage());
301	300
302	301	return TRUE;
…	…
304	303	} else {
305	304
306		midgard_setup_ui_cli~~_config~~::message(_("$name already installed"));
	305	midgard_setup_ui_cli::message(_("$name already installed"));
307	306	return TRUE;
308	307	}
…	…
333	332	if(PEAR::isError($url))
334	333	{
335		midgard_setup_ui_cli~~_config~~::error($url->getMessage());
	334	midgard_setup_ui_cli::error($url->getMessage());
336	335	}
337	336
338	337	/*
339	338	$txt = $name . " - installed: ". $installed_version ." available: ". $url['version'];
340		midgard_setup_ui_cli~~_config~~::message($txt);
	339	midgard_setup_ui_cli::message($txt);
341	340	*/
342	341
…	…
359	358	if (PEAR::isError($ret))
360	359	{
361		midgard_setup_ui_cli~~_config~~::error($ret->getMessage());
	360	midgard_setup_ui_cli::error($ret->getMessage());
362	361	}
363	362
…	…
370	369
371	370	if(PEAR::isError($ret))
372		midgard_setup_ui_cli~~_config~~::error($ret->getMessage());
	371	midgard_setup_ui_cli::error($ret->getMessage());
373	372	}
374	373
…	…
380	379
381	380	if(PEAR::isError($ret))
382		midgard_setup_ui_cli~~_config~~::error($ret->getMessage());
	381	midgard_setup_ui_cli::error($ret->getMessage());
383	382	}
384	383	}
…	…
393	392
394	393	if (PEAR::isError($ret))
395		midgard_setup_ui_cli~~_config~~::error($ret->getMessage());
	394	midgard_setup_ui_cli::error($ret->getMessage());
396	395
397	396	/* update pearfied channel */
…	…
400	399
401	400	if (PEAR::isError($ret))
402		midgard_setup_ui_cli~~_config~~::error($ret->getMessage());
	401	midgard_setup_ui_cli::error($ret->getMessage());
403	402	}
404	403

Navigation

Changeset 12188

Legend:

trunk/midgard/data/midgard_setup_config.php

trunk/midgard/data/midgard_setup_database.php

trunk/midgard/data/midgard_setup_pear.php

Download in other formats: