Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 6723 : import-framework-crlf

Browse source 
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
This commit is contained in:
Ward van Wanrooij 2011-08-15 14:38:40 +02:00 committed by Chris Cormack
parent 54d38461f0
commit 07838bfcb1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
C4/ImportExportFramework.pm
View file

@ -762,7 +762,7 @@ sub _parseSQLLine
my $line;
my $numLines = 0;
while (<$dom>) {
chomp $_;
s/[\r\n]+$//;
$line = $_;
# we don't want to execute any sql statement, only the ones dealing with frameworks
next unless ($line =~ /^\s*(?i:DELETE\s+FROM|INSERT\s+INTO)\s+(?:marc_tag_structure|marc_subfield_structure)/);
@ -1161,7 +1161,7 @@ sub _import_table_csv
if ($row =~ /(?:".*?",?)+/) {
@arrData = split('","', $row);
$arrData[0] = substr($arrData[0], 1) if ($arrData[0] =~ /^"/);
chomp $arrData[$#arrData];
$arrData[$#arrData] =~ s/[\r\n]+$//;
chop $arrData[$#arrData] if ($arrData[$#arrData] =~ /"$/);
if (@arrData) {
if ($arrData[0] eq '#-#' && $arrData[$#arrData] eq '#-#') {