merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -171,11 +171,16 @@
}
if($oModel->getPackage($args->package_srl))
{
executeQuery("autoinstall.updatePackage", $args);
$output = executeQuery("autoinstall.updatePackage", $args);
}
else
{
executeQuery("autoinstall.insertPackage", $args);
$output = executeQuery("autoinstall.insertPackage", $args);
if(!$output->toBool())
{
$output = executeQuery("autoinstall.deletePackage", $args);
$output = executeQuery("autoinstall.insertPackage", $args);
}
}
}
}

View file

@ -0,0 +1,8 @@
<query id="deletePackage" action="delete">
<tables>
<table name="autoinstall_packages" />
</tables>
<conditions>
<condition operation="equal" column="path" var="path" notnull="notnull" />
</conditions>
</query>

View file

@ -2,7 +2,7 @@
<column name="package_srl" type="number" size="11" notnull="notnull" default="0" index="idx_package_srl" />
<column name="category_srl" type="number" size="11" default="0" index="idx_category_srl" />
<column name="path" type="varchar" size="250" notnull="notnull" unique="unique_path" />
<column name="updatedate" type="date" index="idx_regdate " />
<column name="updatedate" type="date" index="idx_regdate" />
<column name="latest_item_srl" type="number" size="11" default="0" notnull="notnull" />
<column name="version" type="varchar" size="255" />
</table>