Modif chargement des tables

This commit is contained in:
Rodolphe Quiedeville 2004-11-27 16:15:55 +00:00
parent 0e5dfd4a16
commit 0be0a1ff14

View File

@ -33,14 +33,14 @@ if (file_exists($conf))
if($dolibarr_main_db_type == "mysql") if($dolibarr_main_db_type == "mysql")
{ {
require ($dolibarr_main_document_root . "/lib/mysql.lib.php"); require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
$choix=1; $choix=1;
} }
else else
{ {
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php"); require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require ($dolibarr_main_document_root . "/lib/grant.postgres.php"); require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
$choix=2; $choix=2;
} }
require ($dolibarr_main_document_root . "/conf/conf.class.php"); require ($dolibarr_main_document_root . "/conf/conf.class.php");
@ -93,20 +93,20 @@ if ($_POST["action"] == "set")
if ($ok) if ($ok)
{ {
$ok = 0; $ok = 0;
if ($choix == 1) if ($choix == 1)
{ {
$dir = "../../mysql/tables/"; $dir = "../../mysql/tables/";
} }
else else
{ {
$dir = "../../pgsql/tables/"; $dir = "../../pgsql/tables/";
} }
$handle=opendir($dir); $handle=opendir($dir);
$table_exists = 0; $table_exists = 0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (substr($file, strlen($file) - 4) == '.sql' && substr($file,0,4) == 'llx_') if (substr($file, strlen($file) - 4) == '.sql' && substr($file,0,4) == 'llx_' && substr($file, - 8) <> '.key.sql')
{ {
$name = substr($file, 0, strlen($file) - 4); $name = substr($file, 0, strlen($file) - 4);
//print "<tr><td>Création de la table $name</td>"; //print "<tr><td>Création de la table $name</td>";
@ -116,12 +116,16 @@ if ($_POST["action"] == "set")
{ {
while (!feof ($fp)) while (!feof ($fp))
{ {
$buffer .= fgets($fp, 4096); $buf = fgets($fp, 4096);
if (substr($buf, 0, 2) <> '--')
{
$buffer .= $buf;
}
} }
fclose($fp); fclose($fp);
} }
if ($db->query($buffer)) if ($db->query($buffer))
{ {
//print "<td>OK requete ==== $buffer</td></tr>"; //print "<td>OK requete ==== $buffer</td></tr>";
} }
@ -144,10 +148,10 @@ if ($_POST["action"] == "set")
} }
//droit sur les tables //droit sur les tables
if ($db->query($grant_query)) if ($db->query($grant_query))
{ {
print "<tr><td>Grant User '$nom' </td><td>OK</td></tr>"; print "<tr><td>Grant User '$nom' </td><td>OK</td></tr>";
} }
closedir($handle); closedir($handle);
if ($error == 0) if ($error == 0)
@ -167,72 +171,72 @@ if ($_POST["action"] == "set")
// //
// Données // Données
// //
if ($choix==1) if ($choix==1)
{ {
$dir = "../../mysql/data/"; $dir = "../../mysql/data/";
$file = "data.sql"; $file = "data.sql";
$fp = fopen($dir.$file,"r"); $fp = fopen($dir.$file,"r");
if ($fp) if ($fp)
{ {
while (!feof ($fp)) while (!feof ($fp))
{ {
$buffer = fgets($fp, 4096); $buffer = fgets($fp, 4096);
if (strlen(trim(ereg_replace("--","",$buffer)))) if (strlen(trim(ereg_replace("--","",$buffer))))
{ {
if ($db->query($buffer)) if ($db->query($buffer))
{
$ok = 1;
}
else
{
if ($db->errno() == 1062)
{
// print "<tr><td>Insertion ligne : $buffer</td><td>
}
else
{
$ok = 0;
print "Erreur SQL ".$db->errno()." sur requete '$buffer': ".$db->error()."<br>";
}
}
}
}
fclose($fp);
}
}//choix==1
else
{ {
$dir = "../../pgsql/data/"; $ok = 1;
$file = "data.sql";
$fp = fopen($dir.$file,"r");
$buffer='';
if ($fp)
{
while (!feof ($fp))
{
$buffer .= fgets($fp, 4096);
}
if ($db->query($buffer))
{
$ok = 1;
}
else
{
if ($db->errno() == 1062)
{
// print "<tr><td>Insertion ligne : $buffer</td><td>Déja existante</td></tr>";
}
else
{
$ok = 0;
print "Erreur SQL ".$db->errno()." sur requete '$buffer': ".$db->error()."<br>";
}
}
//}//while
fclose($fp);
} }
}//else else
{
if ($db->errno() == 1062)
{
// print "<tr><td>Insertion ligne : $buffer</td><td>
}
else
{
$ok = 0;
print "Erreur SQL ".$db->errno()." sur requete '$buffer': ".$db->error()."<br>";
}
}
}
}
fclose($fp);
}
}//choix==1
else
{
$dir = "../../pgsql/data/";
$file = "data.sql";
$fp = fopen($dir.$file,"r");
$buffer='';
if ($fp)
{
while (!feof ($fp))
{
$buffer .= fgets($fp, 4096);
}
if ($db->query($buffer))
{
$ok = 1;
}
else
{
if ($db->errno() == 1062)
{
// print "<tr><td>Insertion ligne : $buffer</td><td>Déja existante</td></tr>";
}
else
{
$ok = 0;
print "Erreur SQL ".$db->errno()." sur requete '$buffer': ".$db->error()."<br>";
}
}
//}//while
fclose($fp);
}
}//else
@ -258,48 +262,48 @@ if ($_POST["action"] == "set")
if ($ok == 1) if ($ok == 1)
{ {
$chem1 = "/facture"; $chem1 = "/facture";
$sql[0] = "UPDATE llx_const SET value = '".$dolibarr_main_data_root."/facture', $sql[0] = "UPDATE llx_const SET value = '".$dolibarr_main_data_root."/facture',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name ='FAC_OUTPUTDIR';" ; where name ='FAC_OUTPUTDIR';" ;
$sql[1] = "UPDATE llx_const SET value = '".$dolibarr_main_data_url."/document/facture', $sql[1] = "UPDATE llx_const SET value = '".$dolibarr_main_data_url."/document/facture',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'FAC_OUTPUT_URL';" ; where name = 'FAC_OUTPUT_URL';" ;
$sql[2] = "UPDATE llx_const SET value = '".$dolibarr_main_data_root."/propale', $sql[2] = "UPDATE llx_const SET value = '".$dolibarr_main_data_root."/propale',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'PROPALE_OUTPUTDIR';" ; where name = 'PROPALE_OUTPUTDIR';" ;
$sql[3] = "UPDATE llx_const SET value = '".$dolibarr_main_url_root."/document/propale', $sql[3] = "UPDATE llx_const SET value = '".$dolibarr_main_url_root."/document/propale',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'PROPALE_OUTPUT_URL';" ; where name = 'PROPALE_OUTPUT_URL';" ;
$sql[4] = "UPDATE llx_const SET value = '".$dolibarr_main_data_root."/ficheinter', $sql[4] = "UPDATE llx_const SET value = '".$dolibarr_main_data_root."/ficheinter',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'FICHEINTER_OUTPUTDIR';" ; where name = 'FICHEINTER_OUTPUTDIR';" ;
$sql[5] = "UPDATE llx_const SET value='".$dolibarr_main_url_root."/document/ficheinter', $sql[5] = "UPDATE llx_const SET value='".$dolibarr_main_url_root."/document/ficheinter',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'FICHEINTER_OUTPUT_URL';" ; where name = 'FICHEINTER_OUTPUT_URL';" ;
$sql[6] = "UPDATE llx_const SET value='".$dolibarr_main_data_root."/societe', $sql[6] = "UPDATE llx_const SET value='".$dolibarr_main_data_root."/societe',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'SOCIETE_OUTPUTDIR';" ; where name = 'SOCIETE_OUTPUTDIR';" ;
$sql[7] = "UPDATE llx_const SET value='".$dolibarr_main_url_root."/document/societe', $sql[7] = "UPDATE llx_const SET value='".$dolibarr_main_url_root."/document/societe',
type = 'chaine', type = 'chaine',
visible = 0 visible = 0
where name = 'SOCIETE_OUTPUT_URL';" ; where name = 'SOCIETE_OUTPUT_URL';" ;
$result = 0; $result = 0;
for ($i=0; $i < sizeof($sql);$i++) for ($i=0; $i < sizeof($sql);$i++)
{ {