X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdbimport.pl;h=a08e169346c83a55cd92b92bc55e52f0b6772828;hb=75987f0dbcbba4fc2bb5a378d14e2fbdb2e30e34;hp=797805eaee2d7513246b81d88b303ad4430c94a0;hpb=059fb24925845865ca791ba53bb540444931f280;p=spider.git

diff --git a/cmd/dbimport.pl b/cmd/dbimport.pl
index 797805ea..a08e1693 100644
--- a/cmd/dbimport.pl
+++ b/cmd/dbimport.pl
@@ -22,8 +22,7 @@ my $count;
 
 open(IMP, $fn) or return (1, "Cannot open $fn $!");
 while (<IMP>) {
-	chomp;
-	s/\r//g;
+	s/[\r\n]+$//g;
 	if ($state == 0) {
 		if (/^\&\&/) {
 			$state = 0;
@@ -50,5 +49,5 @@ while (<IMP>) {
 }
 close (IMP);
 
-push @out, $self->msg('db10', $count, $db->name);
+push @out, $self->msg('db10', $count, $fn, $db->name);
 return (1, @out);