Review of null import patch

diff --git a/dataimport.php b/dataimport.php
index 312143cb409687bef45215d5be708a8e9a7cdc19..3bc242bf349457f6a1188123361ab274793acb24 100644 (file)
--- a/dataimport.php
+++ b/dataimport.php
@@ -3,7 +3,7 @@
        /**
         * Does an import to a particular table from a text file
         *
-        * $Id: dataimport.php,v 1.9 2005/10/05 13:05:32 chriskl Exp $
+        * $Id: dataimport.php,v 1.10 2005/10/09 09:05:16 chriskl Exp $
         */
 
        // Prevent timeouts on large exports (non-safe mode only)
@@ -151,38 +151,30 @@
                } 
        }
 
-       function LoadNULLArray(&$Array) {
-               $Success = true;
-               $AllowedNulls = $_POST['AllowedNulls'];
-               if (!is_null($AllowedNulls)) {
-                       $Array = array();
-                       foreach($AllowedNulls as $NullChar) {
-                               if ($NullChar == 'Default') {
-                                       $Array[2] = "\\N";
-                               } else if ($NullChar == 'NULL') {
-                                       $Array[0] = "NULL";
-                               } else if ($NullChar == 'EmptyString') {
-                                       $Array[1] = null;
-                               } else {
-                                       $misc->printMsg(sprintf($lang['strimporter-badnull'], $NullChar));
-                                       exit;
+       function loadNULLArray() {
+               $array = array();
+               if (isset($_POST['allowednulls'])) {
+                       foreach($_POST['allowednulls'] as $null_char) {
+                               switch ($null_char) {
+                                       case 'default':
+                                               $array[] = "\\N";
+                                               break;
+                                       case 'null':
+                                               $array[] = "NULL";
+                                               break;
+                                       case 'emptystring':
+                                               $array[] = null;
+                                               break;
                                }
                        }
                }
+               return $array;
        }
 
-       function DetermineNull($field, $NullArray) {
-               $FoundANull = false;
-               while((list($Ignored, $Nulls) = each($NullArray)) && ($FoundANull == false)) {
-                       if ($Nulls == $field) {
-                               $FoundANull = true;
-                       }
-               }
-               reset($NullArray);
-               return $FoundANull;
+       function determineNull($field, $null_array) {
+               return in_array($field, $null_array);
        }
 
-
        $misc->printHeader($lang['strimport']);
        $misc->printTrail('table');
        $misc->printTabs('table','import');
@@ -193,11 +185,10 @@
                $fd = fopen($_FILES['source']['tmp_name'], 'r');
                // Check that file was opened successfully
                if ($fd !== false) {            
-                       $NullArray = null;
-                       LoadNULLArray($NullArray);
+                       $null_array = loadNULLArray();
                        $status = $data->beginTransaction();
                        if ($status != 0) {
-                               $misc->printMsg($lang['strimporterror-badtransaction']);
+                               $misc->printMsg($lang['strimporterror']);
                                exit;
                        }
 
@@ -247,7 +238,7 @@
                                                                exit;
                                                        }
                                                        // Check for nulls
-                                                       if (DetermineNull($line[$i], $NullArray)) {
+                                                       if (determineNull($line[$i], $null_array)) {
                                                                $nulls[$f] = 'on';
                                                        }
                                                        // Add to value array
@@ -258,10 +249,11 @@
                                                        $types[$f] = 'text';
                                                        $i++;
                                                }
+
                                                $status = $data->insertRow($_REQUEST['table'], $vars, $nulls, $format, $types);
                                                if ($status != 0) {
                                                        $data->rollbackTransaction();
-                                                       $misc->printMsg(sprintf($lang['strimporterrorline-dberror'], $row));
+                                                       $misc->printMsg(sprintf($lang['strimporterrorline'], $row));
                                                        exit;
                                                }
                                                $row++;
@@ -288,7 +280,7 @@
        
                        $status = $data->endTransaction();
                        if ($status != 0) {
-                               $misc->printMsg($lang['strimporterror-badtransaction']);
+                               $misc->printMsg($lang['strimporterror']);
                                exit;
                        }
                        fclose($fd);
@@ -297,7 +289,7 @@
                }
                else {
                        // File could not be opened
-                       $misc->printMsg($lang['strimporterror-unopenedfile']);
+                       $misc->printMsg($lang['strimporterror']);
                }
        }
        else {

diff --git a/lang/english.php b/lang/english.php
index 887557b62444910d9897729c399a432b53ecfc82..46731b5b6dcde23f21a78f12997f4ba6a5e2318a 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.182 2005/10/05 13:05:32 chriskl Exp $
+        * $Id: english.php,v 1.183 2005/10/09 09:05:16 chriskl Exp $
         */
 
        // Language and character set
@@ -86,10 +86,10 @@
        $lang['strprimary'] = 'Primary';
        $lang['strexport'] = 'Export';
        $lang['strimport'] = 'Import';
-       $lang['strAllowedNulls'] = 'Allowed Null Characters';
-       $lang['strNULL'] = 'NULL (The word)';
-       $lang['strEmptyString'] = 'Empty String/Field';
-       $lang['strBackslashN'] = '\N (Export Default)';
+       $lang['strallowednulls'] = 'Allowed NULL Characters';
+       $lang['strbackslashn'] = '\N';
+       $lang['strnull'] = 'NULL (The word)';
+       $lang['stremptystring'] = 'Empty string/field';
        $lang['strsql'] = 'SQL';
        $lang['stradmin'] = 'Admin';
        $lang['strvacuum'] = 'Vacuum';
@@ -152,14 +152,10 @@
        $lang['strnoreportsdb'] = 'You have not created the reports database. Read the INSTALL file for directions.';
        $lang['strnouploads'] = 'File uploads are disabled.';
        $lang['strimporterror'] = 'Import error.';
-       $lang['strimporter-badnull'] = 'The NULL character you have supplied [%s], has not been configured for use yet.';
-       $lang['strimporterror-badtransaction'] = 'Import error (There was a problem starting/ending the transaction).';
-       $lang['strimporterror-fileformat'] = 'Import error (Failed to determine which file format was given).';
+       $lang['strimporterror-fileformat'] = 'Import error: Failed to automatically determine the file format.';
        $lang['strimporterrorline'] = 'Import error on line %s.';
-       $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s.  (This line does not possess the correct number of columns)';
-       $lang['strimporterrorline-dberror'] = 'Import error on line %s.  (This line could not be inserted into the database)';
-       $lang['strimporterror-unopenedfile'] = 'Import error (Uploaded file could not be opened by the import engine)';
-       $lang['strimporterror-uploadedfile'] = 'Import error:  (File could not be uploaded to the server)';
+       $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s:  Line does not possess the correct number of columns.';
+       $lang['strimporterror-uploadedfile'] = 'Import error: File could not be uploaded to the server';
        $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names on Windows is not supported.';
 
        // Tables

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 4b20c35849a386ab36d6e22c42ac81cef5800c6a..16031657607c4b4811cc46dc8f49b709a4b1e5b4 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.134 2005/10/05 13:05:32 chriskl Exp $
+        * $Id: english.php,v 1.135 2005/10/09 09:05:16 chriskl Exp $
         */
 
        // Language and character set
@@ -86,10 +86,10 @@
        $lang['strprimary'] = 'Primary';
        $lang['strexport'] = 'Export';
        $lang['strimport'] = 'Import';
-       $lang['strAllowedNulls'] = 'Allowed Null Characters';
-       $lang['strNULL'] = 'NULL (The word)';
-       $lang['strEmptyString'] = 'Empty String/Field';
-       $lang['strBackslashN'] = '\N (Export Default)';
+       $lang['strallowednulls'] = 'Allowed NULL Characters';
+       $lang['strbackslashn'] = '\N';
+       $lang['strnull'] = 'NULL (The word)';
+       $lang['stremptystring'] = 'Empty string/field';
        $lang['strsql'] = 'SQL';
        $lang['stradmin'] = 'Admin';
        $lang['strvacuum'] = 'Vacuum';
@@ -152,14 +152,10 @@
        $lang['strnoreportsdb'] = 'You have not created the reports database. Read the INSTALL file for directions.';
        $lang['strnouploads'] = 'File uploads are disabled.';
        $lang['strimporterror'] = 'Import error.';
-       $lang['strimporter-badnull'] = 'The NULL character you have supplied [%s], has not been configured for use yet.';
-       $lang['strimporterror-badtransaction'] = 'Import error (There was a problem starting/ending the transaction).';
-       $lang['strimporterror-fileformat'] = 'Import error (Failed to determine which file format was given).';
+       $lang['strimporterror-fileformat'] = 'Import error: Failed to automatically determine the file format.';
        $lang['strimporterrorline'] = 'Import error on line %s.';
-       $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s.  (This line does not possess the correct number of columns)';
-       $lang['strimporterrorline-dberror'] = 'Import error on line %s.  (This line could not be inserted into the database)';
-       $lang['strimporterror-unopenedfile'] = 'Import error (Uploaded file could not be opened by the import engine)';
-       $lang['strimporterror-uploadedfile'] = 'Import error:  (File could not be uploaded to the server)';
+       $lang['strimporterrorline-badcolumnnum'] = 'Import error on line %s:  Line does not possess the correct number of columns.';
+       $lang['strimporterror-uploadedfile'] = 'Import error: File could not be uploaded to the server';
        $lang['strcannotdumponwindows'] = 'Dumping of complex table and schema names on Windows is not supported.';
 
        // Tables

diff --git a/tblproperties.php b/tblproperties.php
index 02c46ce7b8384865607cb1f64bf3b63f720fec1c..2ab6b16cab10d2864d4a4dfd55f30996303d6ee7 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.64 2005/10/05 13:05:32 chriskl Exp $
+        * $Id: tblproperties.php,v 1.65 2005/10/09 09:05:16 chriskl Exp $
         */
 
        // Include application functions
@@ -198,11 +198,11 @@
                                        echo "<option value=\"xml\">XML</option>\n";
                                }
                                echo "</select>\n</td>\n</tr>\n";
-                               echo "<tr><th class=\"data left required\">{$lang['strAllowedNulls']}</th>";
-                               echo "<td><select multiple size=\"3\" name=\"AllowedNulls[]\">\n";
-                               echo "<option value=\"Default\">{$lang['strBackslashN']}</option>\n";
-                               echo "<option value=\"NULL\">{$lang['strNULL']}</option>\n";
-                               echo "<option value=\"EmptyString\">{$lang['strEmptyString'] }</option>\n";
+                               echo "<tr><th class=\"data left required\">{$lang['strallowednulls']}</th>";
+                               echo "<td><select multiple size=\"3\" name=\"allowednulls[]\">\n";
+                               echo "<option value=\"default\" selected=\"selected\">{$lang['strbackslashn']}</option>\n";
+                               echo "<option value=\"null\">{$lang['strnull']}</option>\n";
+                               echo "<option value=\"emptystring\">{$lang['stremptystring'] }</option>\n";
                                echo "</select>\n</td>\n</tr>\n";
                                echo "<tr><th class=\"data left required\">{$lang['strfile']}</th>";
                                echo "<td><input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"{$max_size}\" />\n";