Fixed issue #TSV export/import multiple with other add a other sub-qu…

…estion Dev: fix importing
LimeSurvey · Feb 19, 2015 · faa1ff0 · faa1ff0 · Shnoulle · Feb 19, 2015
1 parent 5828e20
commit faa1ff0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -4865,7 +4865,7 @@ function TSVImportSurvey($sFullFilePath)
     $surveyinfo['active']='N';
    // unset($surveyinfo['datecreated']);
     $iNewSID = Survey::model()->insertNewSurvey($surveyinfo) ; //or safeDie($clang->gT("Error").": Failed to insert survey<br />");
-    if ($iNewSID==false)
+    if (!$iNewSID)
     {
         $results['error'] = Survey::model()->getErrors();
         $results['bFailed'] = true;
@@ -4984,7 +4984,7 @@ function TSVImportSurvey($sFullFilePath)
                 $insertdata['help'] = (isset($row['help']) ? $row['help'] : '');
                 $insertdata['language'] = (isset($row['language']) ? $row['language'] : $baselang);
                 $insertdata['mandatory'] = (isset($row['mandatory']) ? $row['mandatory'] : '');
-                $insertdata['other'] = (isset($row['other']) ? $row['other'] : 'N');
+                $lastother=$insertdata['other'] = (isset($row['other']) ? $row['other'] : 'N');
                 $insertdata['same_default'] = (isset($row['same_default']) ? $row['same_default'] : 0);
                 $insertdata['parent_qid'] = 0;
 
@@ -5077,17 +5077,17 @@ function TSVImportSurvey($sFullFilePath)
                     $results['defaultvalues']++;
                 }
                 break;
-
             case 'SQ':
                 $sqname = (isset($row['name']) ? $row['name'] : 'SQ' . $sqseq);
                 if ($qtype == 'O' || $qtype == '|')
                 {
                     ;   // these are fake rows to show naming of comment and filecount fields
                 }
-                elseif ($sqname == 'other' && ($qtype == '!' || $qtype == 'L'))
+                elseif ($sqname == 'other' && $lastother=="Y") // If last question have other to Y : it's not a real SQ row
+                {
+                    if($qtype=="!" || $qtype=="L")
                     {
-                        // only want to set default value for 'other' in these cases - not a real SQ row
-                        // TODO - this isn't working
+                        // only used to set default value for 'other' in these cases
                         if (isset($row['default']))
                         {
                             $insertdata=array();
@@ -5096,12 +5096,14 @@ function TSVImportSurvey($sFullFilePath)
                             $insertdata['language'] = (isset($row['language']) ? $row['language'] : $baselang);
                             $insertdata['defaultvalue'] = $row['default'];
                             $result = DefaultValue::model()->insertRecords($insertdata);
-                            if(!$result){
+                            if(!$result)
+                            {
                                 $results['importwarnings'][] = $clang->gT("Warning")." : ".$clang->gT("Failed to insert default value").". ".$clang->gT("Text file row number ").$rownumber;
                                 break;
                             }
                             $results['defaultvalues']++;
                         }
+                    }
                 }
                 else
                 {