cvs: pear /LiveUser/docs/examples demodata.php /LiveUser/docs/examples/example4 demodata.xml /LiveUser/docs/examples/example5 demodata.xml

lsmith Thu Jun 9 09:21:15 2005 EDT Modified files: /pear/LiveUser/docs/examples/example4 demodata.xml /pear/LiveUser/docs/examples/example5 demodata.xml /pear/LiveUser/docs/examples demodata.php Log: - use MDB2_Schema's native support for variable substitution http://cvs.php.net/diff.php/pear/LiveUser/docs/examples/example4/demodata.xml?r1=1.4&r2=1.5&ty=u Index: pear/LiveUser/docs/examples/example4/demodata.xml diff -u pear/LiveUser/docs/examples/example4/demodata.xml:1.4 pear/LiveUser/docs/examples/example4/demodata.xml:1.5 --- pear/LiveUser/docs/examples/example4/demodata.xml:1.4 Sat Apr 30 07:37:09 2005 +++ pear/LiveUser/docs/examples/example4/demodata.xml Thu Jun 9 09:21:13 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <database> - <name>%database%</name> + <name><variable>database</variable></name> <create>1</create> <table> http://cvs.php.net/diff.php/pear/LiveUser/docs/examples/example5/demodata.xml?r1=1.6&r2=1.7&ty=u Index: pear/LiveUser/docs/examples/example5/demodata.xml diff -u pear/LiveUser/docs/examples/example5/demodata.xml:1.6 pear/LiveUser/docs/examples/example5/demodata.xml:1.7 --- pear/LiveUser/docs/examples/example5/demodata.xml:1.6 Sat Apr 30 06:48:25 2005 +++ pear/LiveUser/docs/examples/example5/demodata.xml Thu Jun 9 09:21:14 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <database> - <name>%database%</name> + <name><variable>database</variable></name> <create>1</create> <table> http://cvs.php.net/diff.php/pear/LiveUser/docs/examples/demodata.php?r1=1.3&r2=1.4&ty=u Index: pear/LiveUser/docs/examples/demodata.php diff -u pear/LiveUser/docs/examples/demodata.php:1.3 pear/LiveUser/docs/examples/demodata.php:1.4 --- pear/LiveUser/docs/examples/demodata.php:1.3 Tue Jun 7 05:34:59 2005 +++ pear/LiveUser/docs/examples/demodata.php Thu Jun 9 09:21:14 2005 @@ -45,7 +45,7 @@ * @author Arnaud Limbourg <arnaud@limbourg.com> * @copyright 2002-2005 Markus Wolff * @license http://www.gnu.org/licenses/lgpl.txt - * @version CVS: $Id: demodata.php,v 1.3 2005/06/07 09:34:59 lsmith Exp $ + * @version CVS: $Id: demodata.php,v 1.4 2005/06/09 13:21:14 lsmith Exp $ * @link http://pear.php.net/LiveUser */ @@ -103,35 +103,6 @@ End sanity checks on arguments ******************************************************************/ -$lu_example_data = System::tmpdir() . DIRECTORY_SEPARATOR . '_lu_example_data.xml'; - -$fread = @fopen($file, 'rb'); -$fwrite = @fopen($lu_example_data, 'wb'); - -if ($fread === false || $fwrite === false) { - print "I couldn't not open the file\n"; - $open_error = ($fread === false) - ? "The source file $file cannot be opened" - : "The destination file $lu_example_data cannot be created, are the correct permissions set ?"; - print "$open_error\n"; - exit(); -} - -register_shutdown_function('liveuser_demo_data_cleanup'); - -$dsninfo = MDB2::parseDSN($dsn); - -while (!feof($fread)) { - $buffer = fgets($fread, 4096); - if (strpos($buffer, '%database%') !== false) { - $buffer = str_replace('%database%', $dsninfo['database'], $buffer); - } - fwrite($fwrite, $buffer); -} - -fclose($fread); -fclose($fwrite); - print "\n"; $manager =& new MDB2_Schema; @@ -151,7 +122,7 @@ exit(); } -$res = $manager->updateDatabase($lu_example_data); +$res = $manager->updateDatabase($lu_example_data, false, array('database' => $dsninfo['database'])); if (PEAR::isError($res)) { print "I could not populate the database, see error below\n"; @@ -189,12 +160,4 @@ '); exit; } - -function liveuser_demo_data_cleanup() -{ - global $lu_example_data; - if (file_exists($lu_example_data)) { - System::rm($lu_example_data); - } -} ?> \ No newline at end of file