160 |
} |
} |
161 |
if ($filter) { |
if ($filter) { |
162 |
no strict 'refs'; |
no strict 'refs'; |
163 |
$display_data .= join($delimiter,&$filter($display)); |
$display_data .= $delimiter.&$filter($display); |
164 |
} else { |
} else { |
165 |
if ($display_data) { |
$display_data .= $delimiter.$display; |
|
$display_data .= $delimiter.$display; |
|
|
} else { |
|
|
$display_data .= $display; |
|
|
} |
|
166 |
} |
} |
167 |
} |
} |
168 |
|
|
177 |
if (@index_data) { |
if (@index_data) { |
178 |
if ($index_filter) { |
if ($index_filter) { |
179 |
no strict 'refs'; |
no strict 'refs'; |
180 |
foreach my $d (&$index_filter(@index_data)) { |
foreach my $d (@index_data) { |
181 |
$index->insert($field, $d, $path); |
$index->insert($field, &$index_filter($d), $path); |
182 |
} |
} |
183 |
} else { |
} else { |
184 |
foreach my $d (@index_data) { |
foreach my $d (@index_data) { |
328 |
# if so, erase it and re-open database |
# if so, erase it and re-open database |
329 |
sub check_txt_db { |
sub check_txt_db { |
330 |
my $isis_db = shift || die "need isis database name"; |
my $isis_db = shift || die "need isis database name"; |
331 |
|
my $reopen = 0; |
332 |
|
|
333 |
if (-e $isis_db.".TXT") { |
if (-e $isis_db.".TXT") { |
334 |
print STDERR "WARNING: removing .txt OpenIsis database...\n"; |
print STDERR "WARNING: removing $isis_db.TXT OpenIsis database...\n"; |
335 |
unlink $isis_db.".TXT" || warn "unlink error on '$isis_db.TXT': $!"; |
unlink $isis_db.".TXT" || warn "FATAL: unlink error on '$isis_db.TXT': $!"; |
336 |
my $db = OpenIsis::open( $isis_db ); |
$reopen++; |
337 |
return $db; |
} |
338 |
|
if (-e $isis_db.".PTR") { |
339 |
|
print STDERR "WARNING: removing $isis_db.PTR OpenIsis database...\n"; |
340 |
|
unlink $isis_db.".PTR" || warn "FATAL: unlink error on '$isis_db.PTR': $!"; |
341 |
|
$reopen++; |
342 |
} |
} |
343 |
|
return OpenIsis::open( $isis_db ) if ($reopen); |
344 |
} |
} |
345 |
|
|
346 |
# EOF error |
# EOF error |
347 |
if ($db == -1) { |
if ($db == -1) { |
348 |
$db = check_txt_db($isis_db); |
$db = check_txt_db($isis_db); |
349 |
if (! $db) { |
if ($db == -1) { |
350 |
print STDERR "FATAL: OpenIsis can't open zero size file $isis_db\n"; |
print STDERR "FATAL: OpenIsis can't open zero size file $isis_db\n"; |
351 |
next; |
next; |
352 |
} |
} |
395 |
} |
} |
396 |
} |
} |
397 |
} |
} |
398 |
|
# for this to work with current version of OpenIsis (0.9.0) |
399 |
|
# you might need my patch from |
400 |
|
# http://www.rot13.org/~dpavlin/projects/openisis-0.9.0-perl_close.diff |
401 |
|
OpenIsis::close($db); |
402 |
print STDERR "\n"; |
print STDERR "\n"; |
403 |
|
|
404 |
} elsif ($type_base eq "excel") { |
} elsif ($type_base eq "excel") { |