ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.60 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.61 by root, Thu Aug 30 07:13:17 2007 UTC

494 my ($dir, $file, $type) = @$job; 494 my ($dir, $file, $type) = @$job;
495 495
496 my $data; 496 my $data;
497 aio_load "$dir/$file", $data; 497 aio_load "$dir/$file", $data;
498 498
499
499 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 500 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
500 501
501 next if $meta && !exists $meta->{$file}; 502 utf8::decode $dir;
503 utf8::decode $file;
504
505 # a meta file for resources is now mandatory
506 unless (exists $meta->{$file}) {
507 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
508 next;
509 }
502 510
503 $meta = { 511 $meta = {
504 %{ $meta->{"" } || {} }, 512 %{ $meta->{"" } || {} },
505 %{ $meta->{$file} || {} }, 513 %{ $meta->{$file} || {} },
506 }; 514 };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines