From ea9f0eac68d0ba7ef4718a3ebb67ad6e1f450327 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Mon, 23 Aug 2010 09:25:47 +0000
Subject: [PATCH] Fixed issue: Notice at question importquestion.php Removed
 feature: Ranking slots setting was obsolete in ranking question type ( it is
 covered by max slots)

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9082 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 admin/importquestion.php | 92 +++++++++++++++++++++-------------------
 common.php               | 12 +-----
 2 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/admin/importquestion.php b/admin/importquestion.php
index cad39b61cde..7b8ce0670d6 100644
--- a/admin/importquestion.php
+++ b/admin/importquestion.php
@@ -783,60 +783,64 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid)
     }
 
     // Import subquestions --------------------------------------------------------------
-    foreach ($xml->subquestions->rows->row as $row)
+    if (isset($xml->subquestions))
     {
-        $insertdata=array(); 
-        foreach ($row as $key=>$value)
-        {
-            $insertdata[(string)$key]=(string)$value;
-        }
-        $insertdata['sid']=$newsid;
-        $insertdata['gid']=$newgid;
-        $oldsqid=(int)$insertdata['qid']; unset($insertdata['qid']); // save the old qid
-        $insertdata['parent_qid']=$aQIDReplacements[(int)$insertdata['parent_qid']]; // remap the parent_qid
-
-        // now translate any links
-        $insertdata['title']=translink('survey', $oldsid, $newsid, $insertdata['title']);
-        $insertdata['question']=translink('survey', $oldsid, $newsid, $insertdata['question']);
-        $insertdata['help']=translink('survey', $oldsid, $newsid, $insertdata['help']);
-        if (isset($aQIDReplacements[$oldsqid])){
-           $insertdata['qid']=$aQIDReplacements[$oldsqid];
-           db_switchIDInsert('questions',true);
-        }
         
-        $query=$connect->GetInsertSQL($tablename,$insertdata); 
-        $result = $connect->Execute($query) or safe_die ($clang->gT("Error").": Failed to insert data<br />{$query}<br />\n".$connect->ErrorMsg());
-        $newsqid=$connect->Insert_ID($tablename,"qid"); // save this for later
-        if (!isset($insertdata['qid']))
+        foreach ($xml->subquestions->rows->row as $row)
         {
-            $aQIDReplacements[$oldsqid]=$newsqid; // add old and new qid to the mapping array                
-        }
-        else
-        {
-           db_switchIDInsert('questions',false);
-        }
-        $results['subquestions']++;
-    }
-
-    // Import answers --------------------------------------------------------------
-    if(isset($xml->answers))
-    {
-        $tablename=$dbprefix.'answers';
-        
-        foreach ($xml->answers->rows->row as $row)
-        {
-           $insertdata=array(); 
+            $insertdata=array(); 
             foreach ($row as $key=>$value)
             {
                 $insertdata[(string)$key]=(string)$value;
             }
-            $insertdata['qid']=$aQIDReplacements[(int)$insertdata['qid']]; // remap the parent_qid
+            $insertdata['sid']=$newsid;
+            $insertdata['gid']=$newgid;
+            $oldsqid=(int)$insertdata['qid']; unset($insertdata['qid']); // save the old qid
+            $insertdata['parent_qid']=$aQIDReplacements[(int)$insertdata['parent_qid']]; // remap the parent_qid
 
             // now translate any links
+            $insertdata['title']=translink('survey', $oldsid, $newsid, $insertdata['title']);
+            $insertdata['question']=translink('survey', $oldsid, $newsid, $insertdata['question']);
+            $insertdata['help']=translink('survey', $oldsid, $newsid, $insertdata['help']);
+            if (isset($aQIDReplacements[$oldsqid])){
+               $insertdata['qid']=$aQIDReplacements[$oldsqid];
+               db_switchIDInsert('questions',true);
+            }
+            
             $query=$connect->GetInsertSQL($tablename,$insertdata); 
-            $result=$connect->Execute($query) or safe_die ($clang->gT("Error").": Failed to insert data<br />{$query}<br />\n".$connect->ErrorMsg());
-            $results['answers']++;
-        }            
+            $result = $connect->Execute($query) or safe_die ($clang->gT("Error").": Failed to insert data<br />{$query}<br />\n".$connect->ErrorMsg());
+            $newsqid=$connect->Insert_ID($tablename,"qid"); // save this for later
+            if (!isset($insertdata['qid']))
+            {
+                $aQIDReplacements[$oldsqid]=$newsqid; // add old and new qid to the mapping array                
+            }
+            else
+            {
+               db_switchIDInsert('questions',false);
+            }
+            $results['subquestions']++;
+        }
+
+        // Import answers --------------------------------------------------------------
+        if(isset($xml->answers))
+        {
+            $tablename=$dbprefix.'answers';
+            
+            foreach ($xml->answers->rows->row as $row)
+            {
+               $insertdata=array(); 
+                foreach ($row as $key=>$value)
+                {
+                    $insertdata[(string)$key]=(string)$value;
+                }
+                $insertdata['qid']=$aQIDReplacements[(int)$insertdata['qid']]; // remap the parent_qid
+
+                // now translate any links
+                $query=$connect->GetInsertSQL($tablename,$insertdata); 
+                $result=$connect->Execute($query) or safe_die ($clang->gT("Error").": Failed to insert data<br />{$query}<br />\n".$connect->ErrorMsg());
+                $results['answers']++;
+            }            
+        }
     }
 
     // Import questionattributes --------------------------------------------------------------
diff --git a/common.php b/common.php
index 2662b35745d..2bca9b7e9b6 100644
--- a/common.php
+++ b/common.php
@@ -2563,7 +2563,7 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
         elseif ($arow['type'] == "R")
         {
             //MULTI ENTRY
-            $slots=$connect->GetOne("select value from ".db_table_name('question_attributes')." where qid={$arow['qid']} and attribute='ranking_slots'");
+            $slots=$connect->GetOne("select count(code) from ".db_table_name('answers')." where qid={$arow['qid']} and language='{$s_lang}'");
             for ($i=1; $i<=$slots; $i++)
             {
                 $fieldname="{$arow['sid']}X{$arow['gid']}X{$arow['qid']}$i";
@@ -3790,16 +3790,6 @@ function questionAttributes($returnByName=false)
     "help"=>$clang->gT('Present answers in random order'),
     "caption"=>$clang->gT('Random answer order'));
 
-    $qattributes["ranking_slots"]=array(
-    "types"=>"R",
-    'category'=>$clang->gT('Other'),
-    'sortorder'=>10,
-    'inputtype'=>'integer',
-    'default'=>0,
-    'readonly_when_active'=>true,
-    "help"=>$clang->gT("Set the number of slots available to rank the available answers. Note: This settings can't be changed after survey activation."),
-    "caption"=>$clang->gT('Ranking slots'));
-
     $qattributes["slider_layout"]=array(
     "types"=>"K",
     'category'=>$clang->gT('Slider'),