From d7ba15d47aba5b1621880a7c6ce9a3cacada657d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 24 Aug 2006 00:03:07 +0000
Subject: [PATCH] =?UTF-8?q?Am=E9lioration=20gestion=20erreur=20Fix:=20Corr?=
 =?UTF-8?q?ection=20plantage=20install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/install/etape2.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index e0c4c404e90..5a79558a4f3 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -109,6 +109,8 @@ if ($_POST["action"] == "set")
         //print '<td align="right">'.join('.',$versionarray).'</td></tr>';
     }
 
+	$requestnb=0;
+
     /**************************************************************************************
     *
     * Chargement fichiers tables/*.sql (non *.key.sql)
@@ -144,7 +146,7 @@ if ($_POST["action"] == "set")
                 }
 
                 //print "<tr><td>Création de la table $name/td>";
-
+				$requestnb++;
                 if ($db->query($buffer))
                 {
                     //print "<td>OK requete ==== $buffer</td></tr>";
@@ -158,7 +160,9 @@ if ($_POST["action"] == "set")
                     }
                     else
                     {
-                        print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey",$name)."</td>";
+                        print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey",$name);
+                        print "<br>".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
+                        print "</td>";
                         print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>";
                         $error++;
                     }
@@ -228,9 +232,12 @@ if ($_POST["action"] == "set")
 
                 // Si plusieurs requetes, on boucle sur chaque
                 $listesql=split(';',$buffer);
-                foreach ($listesql as $buffer) {                
-                    if (trim($buffer)) {
-                        //print "<tr><td>Création des clés et index de la table $name: '$buffer'</td>";
+                foreach ($listesql as $buffer)
+                {
+                    if (trim($buffer))
+                    {
+		                //print "<tr><td>Création des clés et index de la table $name: '$buffer'</td>";
+						$requestnb++;
                         if ($db->query(trim($buffer)))
                         {
                             //print "<td>OK requete ==== $buffer</td></tr>";
@@ -247,7 +254,9 @@ if ($_POST["action"] == "set")
                             }
                             else
                             {
-                                print "<tr><td>".$langs->trans("CreateOtherKeysForTable",$name)."</td>";
+                                print "<tr><td>".$langs->trans("CreateOtherKeysForTable",$name);
+                                print "<br>".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
+                                print "</td>";
                                 print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>";
                                 $error++;
                             }