Skip to content

Commit

Permalink
Fixed issue #3294: Notices at VV-import
Browse files Browse the repository at this point in the history
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@7069 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
c-schmitz committed Jun 11, 2009
1 parent 1267fd4 commit 1bf971e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions admin/vvimport.php
Original file line number Diff line number Diff line change
Expand Up @@ -229,32 +229,32 @@

$fielddata=array_combine($fieldnames,$fieldvalues);

if ($fielddata['[submitdate]']=='NULL') unset ($fielddata['[submitdate]']);
if ($fielddata[db_quote_id('submitdate')]=='NULL') unset ($fielddata[db_quote_id('submitdate')]);

$recordexists=false;
if (isset($fielddata['[id]']))
{
$result = $connect->Execute("select id from $surveytable where id=".$fielddata['[id]']);
$result = $connect->Execute("select id from $surveytable where id=".$fielddata[db_quote_id('id')]);
$recordexists=$result->RecordCount()>0;
if ($recordexists) // record with same id exists
{
if ($insertstyle=="ignore")
{
$vvoutput .=sprintf($clang->gT("Record ID %d was skipped because of duplicate ID."), $fielddata['[id]']).'<br/>';
$vvoutput .=sprintf($clang->gT("Record ID %d was skipped because of duplicate ID."), $fielddata[db_quote_id('id')]).'<br/>';
continue;
}
if ($insertstyle=="replace")
{
$result = $connect->Execute("delete from $surveytable where id=".$fielddata['[id]']);
$result = $connect->Execute("delete from $surveytable where id=".$fielddata['id']);
$recordexists=false;
}
}
}
if ($insertstyle=="renumber")
{
unset($fielddata['[id]']);
unset($fielddata['id']);
}
if (isset($fielddata['[id]']))
if (isset($fielddata['id']))
{
if ($databasetype=='odbc_mssql' || $databasetype=='odbtp' || $databasetype=='mssql_n') {$connect->Execute('SET IDENTITY_INSERT '.$surveytable." ON");} //Checked
}
Expand All @@ -266,7 +266,7 @@
$insert .= "('".implode("', '", array_values($fielddata))."')\n";
$result = $connect->Execute($insert);

if (isset($fielddata['[id]']))
if (isset($fielddata['id']))
{
if ($databasetype=='odbc_mssql' || $databasetype=='odbtp' || $databasetype=='mssql_n') {$connect->Execute('SET IDENTITY_INSERT '.$surveytable." OFF");} //Checked
}
Expand Down

0 comments on commit 1bf971e

Please sign in to comment.