projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use JSON as the ForkCall serialiser
[spider.git]
/
cmd
/
dbimport.pl
diff --git
a/cmd/dbimport.pl
b/cmd/dbimport.pl
index 55d5e6322c00c4975e7387f90f2ca02e89781049..a08e169346c83a55cd92b92bc55e52f0b6772828 100644
(file)
--- 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>) {
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;
if ($state == 0) {
if (/^\&\&/) {
$state = 0;
@@
-31,14
+30,18
@@
while (<IMP>) {
}
$key = uc $_;
$value = undef;
}
$key = uc $_;
$value = undef;
- ++$state;
+ ++$state
if $key
;
} elsif ($state == 1) {
if (/^\&\&/) {
if ($key =~ /^#/) {
} elsif ($state == 1) {
if (/^\&\&/) {
if ($key =~ /^#/) {
+ } elsif ($key && $value) {
+ $db->putkey($key, $value);
+ $count++;
}
}
- $db->putkey($key, $value);
$state = 0;
$state = 0;
- $count++;
+ next;
+ } elsif (/^\%\%/) {
+ $state = 0;
next;
}
$value .= $_ . "\n";
next;
}
$value .= $_ . "\n";
@@
-46,5
+49,5
@@
while (<IMP>) {
}
close (IMP);
}
close (IMP);
-push @out, $self->msg('db10', $count, $db->name);
+push @out, $self->msg('db10', $count, $
fn, $
db->name);
return (1, @out);
return (1, @out);