From 042df2c8131237da64bd9f9c9d827304503df34b Mon Sep 17 00:00:00 2001 From: wyd621 Date: Fri, 19 Jul 2013 14:02:48 +0800 Subject: [PATCH] * finish task #1577. --- bin/init.sh | 9 +++++++++ module/admin/config.php | 18 ++++++++++++++++++ module/admin/control.php | 19 +------------------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/bin/init.sh b/bin/init.sh index f191d78625..f059ff9954 100755 --- a/bin/init.sh +++ b/bin/init.sh @@ -73,6 +73,15 @@ fi echo $checkdb > $basePath/checkdb.sh echo "checkdb.sh ok" +# win to unix +if [ $requestType == 'PATH_INFO' ]; then + win2Unix="$phpcli $basePath/ztcli '$pmsRoot/admin-win2Unix'"; +else + win2Unix="$phpcli $basePath/ztcli '$pmsRoot/?m=admin&f=win2Unix'"; +fi +echo $win2Unix > $basePath/win2unix.sh +echo "win2unix.sh ok" + # syncsvn. if [ $requestType == 'PATH_INFO' ]; then syncsvn="$phpcli $basePath/ztcli '$pmsRoot/svn-run'"; diff --git a/module/admin/config.php b/module/admin/config.php index 315eb9e194..4bc085c58c 100644 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -12,3 +12,21 @@ $config->url->service = 'http://www.cnezsoft.com/article-browse-1078.html'; $config->admin->flow2Ext['onlyTest'] = 'zentaotest'; $config->admin->flow2Ext['onlyTask'] = 'zentaotask'; $config->admin->flow2Ext['onlyStory'] = 'zentaostory'; + +$config->win2Unix->renameTables = array( + 'zt_casestep' => 'zt_caseStep' , + 'zt_doclib' => 'zt_docLib' , + 'zt_grouppriv' => 'zt_groupPriv' , + 'zt_productplan' => 'zt_productPlan' , + 'zt_projectproduct' => 'zt_projectProduct' , + 'zt_projectstory' => 'zt_projectStory' , + 'zt_storyspec' => 'zt_storySpec' , + 'zt_taskestimate' => 'zt_taskEstimate' , + 'zt_testresult' => 'zt_testResult' , + 'zt_testrun' => 'zt_testRun' , + 'zt_testtask' => 'zt_testTask' , + 'zt_usercontact' => 'zt_userContact' , + 'zt_usergroup' => 'zt_userGroup' , + 'zt_userquery' => 'zt_userQuery' , + 'zt_usertpl' => 'zt_userTPL' + ); diff --git a/module/admin/control.php b/module/admin/control.php index 2a7e8f408c..669b404c20 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -122,24 +122,7 @@ class admin extends control */ public function win2Unix() { - $renameTables = array( - 'zt_casestep' => 'zt_caseStep' , - 'zt_doclib' => 'zt_docLib' , - 'zt_grouppriv' => 'zt_groupPriv' , - 'zt_productplan' => 'zt_productPlan' , - 'zt_projectproduct' => 'zt_projectProduct' , - 'zt_projectstory' => 'zt_projectStory' , - 'zt_relationoftasks' => 'zt_relationOfTasks', - 'zt_storyspec' => 'zt_storySpec' , - 'zt_taskestimate' => 'zt_taskEstimate' , - 'zt_testresult' => 'zt_testResult' , - 'zt_testrun' => 'zt_testRun' , - 'zt_testtask' => 'zt_testTask' , - 'zt_usercontact' => 'zt_userContact' , - 'zt_usergroup' => 'zt_userGroup' , - 'zt_userquery' => 'zt_userQuery' , - 'zt_usertpl' => 'zt_userTPL' - ); + $renameTables = $this->config->win2Unix->renameTables; $existTables = $this->dbh->query('SHOW TABLES')->fetchAll(); foreach($existTables as $key => $table) $existTables[$key] = current((array)$table);