Fixed issue 06137: Import Excel survey structure leads to database crash

<Dev> Added try/catch mechanism for Answers::model()->insertRecords() and Questions::model()->insertRecords() <Dev> Added descriptive error messages
LimeSurvey · May 30, 2012 · 4e48ede · 4e48ede
1 parent 8883bb3
commit 4e48ede
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 12 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -941,7 +941,7 @@ public function copy()
                 unlink($sFullFilepath);
             }
 
-            if (isset($aImportResults['error']) && $aImportResults['error']) safeDie($aImportResults['error']);
+//            if (isset($aImportResults['error']) && $aImportResults['error']) safeDie($aImportResults['error']);
 
             if (!$aData['bFailed'])
             {

diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -4159,7 +4159,7 @@ function ExcelImportSurvey($sFullFilepath)
     $results['error']=false;
     $baselang = 'en';   // TODO set proper default
 
-    try {
+//    try {
         $data = new Spreadsheet_Excel_Reader($sFullFilepath);
         $adata = $data->dumptonamedarray();
 
@@ -4260,8 +4260,10 @@ function ExcelImportSurvey($sFullFilepath)
             $baselang = $surveyinfo['language'];    // the base language
         }
 
+		  $rownumber = 1;
         foreach ($adata as $row)
         {
+        		$rownumber += 1;
             $row = str_replace(chr(0xA0),' ',$row);
             switch($row['class'])
             {
@@ -4330,8 +4332,13 @@ function ExcelImportSurvey($sFullFilepath)
                         $insertdata['question_order'] = $qseq;
                     }
 
-                    $newqid = Questions::model()->insertRecords($insertdata) or safeDie ($clang->gT("Error").": Failed to insert question<br />");
+                    $result = Questions::model()->insertRecords($insertdata); //or safeDie ($clang->gT("Error").": Failed to insert question<br />");
+                    if(!$result){
+                    	 $results['error'][] = $clang->gT("Error")." : ".$clang->gT("Could not insert question").". ".$clang->gT("Excel row number ").$rownumber." (".$qname.")";
+                    	 break;
+                    }
 
+						  $newqid = $result;
                     if (!isset($qinfo[$qname]))
                     {
                         $results['questions']++;
@@ -4474,15 +4481,18 @@ function ExcelImportSurvey($sFullFilepath)
                     $insertdata['assessment_value'] = (isset($row['relevance']) ? $row['relevance'] : '');
                     $insertdata['sortorder'] = ++$aseq;
 
-                    $result = Answers::model()->insertRecords($insertdata) or safeDie("Error: Failed to insert answer<br />");
+                    $result = Answers::model()->insertRecords($insertdata); // or safeDie("Error: Failed to insert answer<br />");
+                    if(!$result){
+                    	 $results['error'][] = $clang->gT("Error")." : ".$clang->gT("Could not insert answer").". ".$clang->gT("Excel row number ").$rownumber;
+                    }
                     $results['answers']++;
                     break;
             }
 
         }
-    }
-    catch (Exception $e) {
-        $results['error'] = $e->getMessage();
-    }
+//    }
+//    catch (Exception $e) {
+//        $results['error'] = $e->getMessage();
+//    }
     return $results;
 }
diff --git a/application/models/Answers.php b/application/models/Answers.php
@@ -109,7 +109,14 @@ function insertRecords($data)
         $ans = new self;
 		foreach ($data as $k => $v)
 			$ans->$k = $v;
-		return $ans->save();
+		try
+		{
+			return $ans->save();
+		}
+		catch(Exception $e)
+		{
+			return false;
+		}
     }
 
     /**

diff --git a/application/models/Questions.php b/application/models/Questions.php
@@ -208,8 +208,17 @@ function insertRecords($data)
             $questions = new self;
             foreach ($data as $k => $v)
                 $questions->$k = $v;
-            if  (!$questions->save()) return false;
-            else return $questions->qid;
+//            if  (!$questions->save()) return false;
+//            else return $questions->qid;
+            try
+            {
+            	$questions->save();
+            	return $questions->qid;
+            }
+            catch(Exception $e)
+            {
+            	return false;
+        		}
         }
 
         public static function deleteAllById($questionsIds)

diff --git a/application/views/admin/survey/importSurvey_view.php b/application/views/admin/survey/importSurvey_view.php
@@ -12,7 +12,16 @@
     <?php if (isset($aImportResults['error']) && $aImportResults['error']!=false)
         {?>
         <div class='warningheader'><?php $clang->eT("Error");?></div><br />
-        <?php echo $aImportResults['error']; ?><br /><br />
+        <?php
+        	if(is_array($aImportResults['error']))
+        	{
+        		foreach($aImportResults['error'] as $error) 
+        			echo $error."<br/>";
+      		} else 
+      		{
+	        	echo $aImportResults['error'];
+        	} 
+    		?><br /><br />
         <input type='submit' value='<?php $clang->eT("Main Admin Screen");?>' onclick="window.open('<?php echo site_url('admin');?>', '_top')" />
         <?php } else
         {?>