--- messaging/manakai/bin/daf.pl	2006/04/03 12:53:22	1.10
+++ messaging/manakai/bin/daf.pl	2006/04/09 14:29:41	1.12
@@ -12,6 +12,7 @@
   swcfg21 => q<http://suika.fam.cx/~wakaba/archive/2005/swcfg21#>,
   test => q<http://suika.fam.cx/~wakaba/archive/2004/dis/Test#>,
   Util => q<http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/>,
+  xp => q<http://suika.fam.cx/~wakaba/archive/2004/dom/xml-parser#>,
 };
 
 use Cwd;
@@ -34,6 +35,7 @@
   'debug' => \$Opt{debug},
   'dis-file-suffix=s' => \$Opt{dis_suffix},
   'daem-file-suffix=s' => \$Opt{daem_suffix},
+  'dafs-file-suffix=s' => \$Opt{dafs_suffix},
   'dafx-file-suffix=s' => \$Opt{dafx_suffix},
   'help' => \$Opt{help},
   'search-path|I=s' => sub {
@@ -82,6 +84,7 @@
 $Opt{dis_suffix} = '.dis' unless defined $Opt{dis_suffix};
 $Opt{daem_suffix} = '.dafm' unless defined $Opt{daem_suffix};
 $Opt{dafx_suffix} = '.dafx' unless defined $Opt{dafx_suffix};
+$Opt{dafs_suffix} = '.dafs' unless defined $Opt{dafs_suffix};
 $Message::DOM::DOMFeature::DEBUG = 1 if $Opt{debug};
 require Error;
 $Error::Debug = 1 if $Opt{debug};
@@ -543,8 +546,11 @@
   my ($db, $mod, $type) = @_;
   my $ns = $mod->namespace_uri;
   my $ln = $mod->local_name;
-  my $suffix = $type eq ExpandedURI q<dp:ModuleIndexFile>
-                 ? $Opt{dafx_suffix} : $Opt{daem_suffix};
+  my $suffix = {
+    ExpandedURI q<dp:ModuleIndexFile> => $Opt{dafx_suffix},
+    ExpandedURI q<dp:ModuleResourceFile> => $Opt{daem_suffix},
+    ExpandedURI q<dp:ModuleNodeStorageFile> => $Opt{dafs_suffix},
+  }->{$type} or die "Unsupported type: <$type>";
   verbose_msg qq<Database module <$ns$ln> is requested>;
   my $name = dac_search_file_path_stem ($ns, $ln, $suffix);
   if (defined $name) {
@@ -621,16 +627,16 @@
     );
   ');
 
-  $pack->append_code
-    ($pc->create_perl_statement
-       ('my $impl = $Message::DOM::ImplementationRegistry->get_implementation ({
-           "http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/DIS#Test"
-             => "1.0",
-         })'));
-
-  $pack->append_code
-      (my $num_statement = $pc->create_perl_statement 
-                                  ('my $test = $impl->create_test_manager'));
+  $pack->append_child ($factory->create_pc_statement)
+       ->append_code
+           ('my $impl = $Message::DOM::ImplementationRegistry
+                            ->get_implementation ({
+                "http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/DIS#Test"
+                    => "1.0",
+            })');
+
+  my $num_statement = $pack->append_child ($factory->create_pc_statement);
+  $num_statement->append_code ('my $test = $impl->create_test_manager');
 
   my $total_tests = 0;
   my %processed;
@@ -658,7 +664,7 @@
           die "Perl test code not defined for <".$res->uri.">";
         }
         
-        $pack->append_code_fragment ($test_pc);
+        $pack->append_child ($test_pc);
         
         $pack->append_code ('$test->ok;');
         
@@ -689,7 +695,7 @@
                                    (ExpandedURI q<test:Entity>)}) {
             my $tent = $ttest->{entity}->{$eres->uri} = {};
             for (ExpandedURI q<test:uri>, ExpandedURI q<test:baseURI>,
-                 ExpandedURI q<test:value>) {
+                 ExpandedURI q<test:value>, ExpandedURI q<xp:encoding>) {
               my $v = $eres->get_property_text ($_);
               $tent->{$_} = $v if defined $v;
             }
@@ -734,7 +740,7 @@
           die "Resource <".$res->uri."> does not have Perl test code";
         }
 
-        $block->append_code_fragment ($plc);
+        $block->append_child ($plc);
         
       } # test resource type
     } # test:Test