fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-25 14:19:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge sandbox to trunk for 1.4.4.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/counter/counter.class.php
View file

@ -26,16 +26,11 @@
* @brief 설치가 이상이 없는지 체크하는 method
**/
function checkUpdate() {
$db_info = Context::getDbInfo ();
// 카운터에 site_srl추가
$oDB = &DB::getInstance();
if(!$oDB->isColumnExists('counter_log', 'site_srl')) return true;
if ($db_info->db_type == 'cubrid') {
if(!$oDB->isIndexExists('counter_log', $oDB->prefix.'counter_log_idx_site_counter_log')) return true;
}
else {
if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) return true;
}
if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) return true;
return false;
}
@ -43,19 +38,10 @@
* @brief 업데이트 실행
**/
function moduleUpdate() {
$db_info = Context::getDBInfo ();
// 카운터에 site_srl추가
$oDB = &DB::getInstance();
if(!$oDB->isColumnExists('counter_log', 'site_srl'))
$oDB->addColumn('counter_log','site_srl','number',11,0,true);
if ($db_info->db_type == 'cubrid') {
if(!$oDB->isIndexExists('counter_log',$oDB->prefix.'counter_log_idx_site_counter_log'))
$oDB->addIndex('counter_log',$oDB->prefix.'counter_log_idx_site_counter_log',array('site_srl','ipaddress'),false);
}
else {
if(!$oDB->isIndexExists('counter_log','idx_site_counter_log'))
$oDB->addIndex('counter_log','idx_site_counter_log',array('site_srl','ipaddress'),false);
}
if(!$oDB->isColumnExists('counter_log', 'site_srl')) $oDB->addColumn('counter_log','site_srl','number',11,0,true);
if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) $oDB->addIndex('counter_log','idx_site_counter_log',array('site_srl','ipaddress'),false);
return new Object(0, 'success_updated');
}

2
modules/counter/queries/deleteSiteCounter.xml
View file

@ -3,6 +3,6 @@
<table name="counter_site_status" />
</tables>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" pipe="and" />
<condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" pipe="and" />
</conditions>
</query>

2
modules/counter/queries/deleteSiteCounterLog.xml
View file

@ -3,6 +3,6 @@
<table name="counter_log" />
</tables>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" pipe="and" />
<condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" pipe="and" />
</conditions>
</query>