[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.289 by root, Sat Jun 30 03:00:54 2007 UTC

 use Coro::Signal;
 use Coro::Semaphore;
 use Coro::AIO;
 use Coro::Storable;
+use JSON::XS 1.4 ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
 use YAML::Syck ();
       $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
       $d
    } || "[unable to dump $_[0]: '$@']";
 }
-use JSON::XS ();
 =item $ref = cf::from_json $json
 Converts a JSON string into the corresponding perl data structure.
 =item $json = cf::to_json $ref
 Converts a perl data structure into its JSON representation.
 =cut
-our $json_coder = JSON::XS->new->convert_blessed->utf8;
+our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max
 sub to_json   ($) { $json_coder->encode ($_[0]) }
 sub from_json ($) { $json_coder->decode ($_[0]) }
 =item cf::lock_wait $string
 }
 sub reload_archetypes {
    load_resource_file "$DATADIR/archetypes"
       or die "unable to load archetypes\n";
+   #d# NEED to laod twice to resolve forward references
+   # this really needs to be done in an extra post-pass
+   # (which needs to be synchronous, so solve it differently)
+   load_resource_file "$DATADIR/archetypes"
+      or die "unable to load archetypes\n";
 }
 sub reload_treasures {
    load_resource_file "$DATADIR/treasures"
       or die "unable to load treasurelists\n";

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines