Index: branches/version-2/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- branches/version-2/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 17047)
+++ branches/version-2/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 17048)
@@ -80,5 +80,5 @@
         if (!isset($_POST['mode'])) $_POST['mode'] = "";
 
-        switch($_POST['mode']) {
+        switch ($_POST['mode']) {
             case 'csv_upload':
                 $err = false;
@@ -99,5 +99,5 @@
                 echo str_pad('',256);
 
-                if(empty($arrErr['csv_file'])) {
+                if (empty($arrErr['csv_file'])) {
                     // 一時ファイル名の取得
                     $filepath = $this->objUpFile->getTempFilePath('csv_file');
@@ -118,5 +118,5 @@
                     echo "■　CSV登録進捗状況 <br/><br/>\n";
 
-                    while(!feof($fp) && !$err) {
+                    while (!feof($fp) && !$err) {
                         $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
 
@@ -124,5 +124,5 @@
                         $line++;
 
-                        if($line <= 1) {
+                        if ($line <= 1) {
                             continue;
                         }
@@ -132,10 +132,10 @@
 
                         // 項目数が1以下の場合は無視する
-                        if($max <= 1) {
+                        if ($max <= 1) {
                             continue;
                         }
 
                         // 項目数チェック
-                        if($max != $colmax) {
+                        if ($max != $colmax) {
                             echo "※ 項目数が" . $max . "個検出されました。項目数は" . $colmax . "個になります。</br>\n";
                             $err = true;
@@ -152,5 +152,5 @@
 
                         // 入力エラーチェック
-                        if(count($arrCSVErr) > 0) {
+                        if (count($arrCSVErr) > 0) {
                             echo "<font color=\"red\">■" . $line . "行目でエラーが発生しました。</font></br>\n";
                             foreach($arrCSVErr as $val) {
@@ -160,5 +160,5 @@
                         }
 
-                        if(!$err) {
+                        if (!$err) {
                             $this->lfRegistProduct($objQuery, $line);
                             $regist++;
@@ -166,10 +166,10 @@
                         $arrParam = $this->objFormParam->getHashArray();
 
-                        if(!$err) echo $line." / ".$rec_count. "行目　（カテゴリID：".$arrParam['category_id']." / カテゴリ名：".$arrParam['category_name'].")\n<br />";
+                        if (!$err) echo $line." / ".$rec_count. "行目　（カテゴリID：".$arrParam['category_id']." / カテゴリ名：".$arrParam['category_name'].")\n<br />";
                         flush();
                     }
                     fclose($fp);
 
-                    if(!$err) {
+                    if (!$err) {
                         $objQuery->commit();
                         echo "■" . $regist . "件のレコードを登録しました。";
@@ -212,6 +212,5 @@
      */
     function lfInitFile() {
-        $this->objUpFile->addFile("CSVファイル", 'csv_file', array('csv'),
-        CSV_SIZE, true, 0, 0, false);
+        $this->objUpFile->addFile("CSVファイル", 'csv_file', array('csv'), CSV_SIZE, true, 0, 0, false);
     }
 
@@ -239,17 +238,11 @@
         
         //カテゴリID
-        $update = false;
-        if($arrRet['category_id'] != ""){
+        if ($arrRet['category_id'] == 0) {
+            $category_id = $objQuery->max("dtb_category", "category_id") + 1;
+            $sqlval['category_id'] = $category_id;
+            $update = false;
+        } else {
             $sqlval['category_id'] = $arrRet['category_id'];
             $update = true;
-        }else{
-            $category_id = $objQuery->max("dtb_category","category_id")+1;
-            $sqlval['category_id'] = $category_id;
-            $count = $objQuery->count("dtb_category", "category_id = ?", array($arrRet['category_id']));
-            if($count == 0){
-                $update = false;
-            }else{
-                $update = true;
-            }
         }
         
@@ -263,11 +256,11 @@
         } else {
             $sqlval['parent_category_id'] = $arrRet['parent_category_id'];
-            $parent_level = $objQuery->get('dtb_category','level',"category_id = ?",array($sqlval['parent_category_id']));
-            $sqlval['level'] = $parent_level+1;
+            $parent_level = $objQuery->get("dtb_category", "level", "category_id = ?", array($sqlval['parent_category_id']));
+            $sqlval['level'] = $parent_level + 1;
         }
         
         // その他
         $time = date("Y-m-d H:i:s");
-        if($line != "") {
+        if ($line != "") {
             $microtime = sprintf("%06d", $line);
             $time .= ".$microtime";
@@ -275,7 +268,7 @@
         $sqlval['update_date'] = $time;
         $sqlval['creator_id'] = $_SESSION['member_id'];
-
-        // UPDATE
-        if($update) {
+        
+        // 更新
+        if ($update) {
             echo "UPDATE　";
             $where = "category_id = ?";
@@ -284,4 +277,5 @@
         // 新規登録
         } else {
+            echo "INSERT　";
             $sqlval['create_date'] = $time;
             // ランク
@@ -298,5 +292,4 @@
                 $objQuery->exec($sqlup, array($sqlval['rank']));
             }
-            echo "INSERT　";
             $objQuery->insert("dtb_category", $sqlval);
         }
@@ -322,8 +315,8 @@
         
         // 存在する親カテゴリIDかチェック
-        if(count($objErr->arrErr) == 0) {
-            if($parent_category_id != 0){
+        if (count($objErr->arrErr) == 0) {
+            if ($parent_category_id != 0){
                 $count = $objQuery->count("dtb_category", "category_id = ?", array($parent_category_id));
-                if($count == 0) {
+                if ($count == 0) {
                     $objErr->arrErr['parent_category_id'] = "※ 指定の親カテゴリID(".$parent_category_id.")は、存在しません。";
                 }
@@ -332,7 +325,7 @@
         
         // 階層チェック
-        if(!isset($objErr->arrErr['category_name']) && !isset($objErr->arrErr['parent_category_id'])) {
+        if (!isset($objErr->arrErr['category_name']) && !isset($objErr->arrErr['parent_category_id'])) {
             $level = $objQuery->get("dtb_category", "level", "category_id = ?", array($parent_category_id));
-            if($level >= LEVEL_MAX) {
+            if ($level >= LEVEL_MAX) {
                 $objErr->arrErr['category_name'] = "※ ".LEVEL_MAX."階層以上の登録はできません。<br>";
             }
@@ -340,5 +333,5 @@
 
         // 重複チェック
-        if(!isset($objErr->arrErr['category_name']) && !isset($objErr->arrErr['parent_category_id'])) {
+        if (!isset($objErr->arrErr['category_name']) && !isset($objErr->arrErr['parent_category_id'])) {
             $where = "parent_category_id = ? AND category_name = ?";
             $arrCat = $objQuery->select("category_id, category_name", "dtb_category", $where, array($parent_category_id, $arrRet['category_name']));