2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Export to SPSS was failing due to queXS tokens

Only include Nap javascript when nap is enabled
This commit is contained in:
azammitdcarf
2011-04-08 06:32:51 +00:00
parent b9929cfd2a
commit a80f582ec3
2 changed files with 24 additions and 12 deletions

View File

@@ -304,7 +304,7 @@ function spss_fieldmap($prefix = 'V') {
$fields=array();
if (isset($tokensexist) && $tokensexist == true && $surveyprivate == 'N') {
$tokenattributes=GetTokenFieldsAndNames($surveyid,false);
$tokenattributes=GetTokenFieldsAndNames($surveyid,false,false);
foreach ($tokenattributes as $attributefield=>$attributedescription)
{
//Drop the token field, since it is in the survey too
@@ -428,7 +428,7 @@ function spss_getquery() {
#See if tokens are being used
if (isset($tokensexist) && $tokensexist == true && $surveyprivate == 'N') {
$query="SELECT ";
$tokenattributes=GetTokenFieldsAndNames($surveyid,false);
$tokenattributes=GetTokenFieldsAndNames($surveyid,false,false);
foreach ($tokenattributes as $attributefield=>$attributedescription) {
//Drop the token field, since it is in the survey too
if($attributefield!='token' && $attributefield!='callattempts' && $attributefield!='onappointment') { //queXS Addition