From d09af4f475272c575a09fc1f8719b2d0c5d20a99 Mon Sep 17 00:00:00 2001
From: abijah <abijah@97e9348a-65ac-dc4b-aefc-98561f571b83>
Date: Wed, 8 Jul 2009 21:49:00 +0000
Subject: [PATCH] More work to make the db scripts general

git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@266 97e9348a-65ac-dc4b-aefc-98561f571b83
---
 build.cmd                | 2 +-
 scripts/sitelink2pmgr.pl | 5 +++++
 site/app_controller.php  | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.cmd b/build.cmd
index d073afd..16d0440 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,3 @@
 @echo off
-%~dp0\scripts\sitelink2pmgr.pl %~dp0\db\schema.sql %~dp0db\vss.mdb > NUL
+%~dp0\scripts\sitelink2pmgr.pl %~dp0\db\schema.sql %~dp0db\vss.mdb %* > NUL
 echo Done!
diff --git a/scripts/sitelink2pmgr.pl b/scripts/sitelink2pmgr.pl
index e84b47c..de66a30 100644
--- a/scripts/sitelink2pmgr.pl
+++ b/scripts/sitelink2pmgr.pl
@@ -26,6 +26,11 @@ my $sdbh = DBI->connect("dbi:ADO:$sdsn", undef, undef, {PrintError => 1,
 my($hostname, $database, $user, $password) = ('localhost',
 					      'property_manager',
 					      'pmgr', 'pmgruser');
+
+$database = shift if @ARGV;
+$user     = shift if @ARGV;
+$password = shift if @ARGV;
+
 print STDERR "Connecting to $database as $user\n";
 my $db_handle = DBI->connect("DBI:mysql:database=$database;host=$hostname",
 			     $user, $password,
diff --git a/site/app_controller.php b/site/app_controller.php
index 0db3285..bdf14ea 100644
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -64,9 +64,13 @@ class AppController extends Controller {
     Configure::write('debug', '0');
     $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
     echo "<P>" . date('r') . "\n";
-    echo "<P>Script: $script" . "\n";
+    //echo "<P>Script: $script" . "\n";
+    $db = & $this->Account->getDataSource();
+    $script .= ' "' . $db->config['database'] . '"';
+    $script .= ' "' . $db->config['login']    . '"';
+    $script .= ' "' . $db->config['password'] . '"';
     $handle = popen($script . ' 2>&1', 'r');
-    echo "<P>Handle: $handle; " . gettype($handle) . "\n";
+    //echo "<P>Handle: $handle; " . gettype($handle) . "\n";
     echo "<P><PRE>\n";
     while (($read = fread($handle, 2096))) {
       echo $read;