Index: statistics_function.php =================================================================== --- statistics_function.php (revision 10404) +++ statistics_function.php (working copy) @@ -142,14 +142,17 @@ if($q2show=='all' ) { - $summarySql=" SELECT gid, parent_qid, qid, type " - ." FROM {$dbprefix}questions WHERE parent_qid=0" - ." AND sid=$surveyid "; + $summarySql=" SELECT gid, parent_qid, qid, type, title " + ." FROM {$dbprefix}questions" + ." WHERE sid=$surveyid "; $summaryRs = db_execute_assoc($summarySql); foreach($summaryRs as $field) { + if ($field['parent_qid'] == 0) { + // Not array type + if (($field['type'] != "A") && ($field['type'] != "B") && ($field['type'] != "C") && ($field['type'] != "D") && ($field['type'] != "E") && ($field['type'] != "F")) { $myField = $surveyid."X".$field['gid']."X".$field['qid']; // Multiple choice get special treatment @@ -181,11 +184,20 @@ } - if($q2show=='all') - $summary[]=$myField; - //$allfields[]=$myField; + } + } + else { + $myField = $surveyid."X".$field['gid']."X".$field['parent_qid'].$field['title']; + } + + if($q2show=='all' && $myField!=null) { + $summary[]=$myField; + } + //$allfields[]=$myField; + $myField = null; + } } else {