Fixed package callers tracking.

diff --git a/project/Lib.pm b/project/Lib.pm
index 9259361..67bc50a 100644 (file)
--- a/project/Lib.pm
+++ b/project/Lib.pm
@@ -30,8 +30,6 @@ use Carp qw(cluck confess);
 use Exporter;
 our @EXPORT=qw();
 our @ISA=qw(My::Web Exporter);
-Wuse 'My::Hash::Sub';
-Wuse 'My::Hash::Sub::Readonly';
 
 
 sub LIST_FILENAME()
@@ -193,6 +191,7 @@ sub project_arrayref_to_hashref($$)
 {
 my($self,$arrayref)=@_;
 
+       Wuse 'My::Hash::Sub::Readonly';
        my $r={};
        tie %$r,"My::Hash::Sub::Readonly",(
                        @$arrayref,

diff --git a/project/captive/doc/APITypes.pm b/project/captive/doc/APITypes.pm
index 60aea6f..68ec154 100755 (executable)
--- a/project/captive/doc/APITypes.pm
+++ b/project/captive/doc/APITypes.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: API Functions',
                "rel_prev"=>'Details.pm',

diff --git a/project/captive/doc/About.pm b/project/captive/doc/About.pm
index 17a9445..24fa819 100755 (executable)
--- a/project/captive/doc/About.pm
+++ b/project/captive/doc/About.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "__PACKAGE__"=>__PACKAGE__,
                "title"=>'Captive NTFS Developer Documentation: About',

diff --git a/project/captive/doc/Architecture.pm b/project/captive/doc/Architecture.pm
index ae9f170..0f66a9f 100755 (executable)
--- a/project/captive/doc/Architecture.pm
+++ b/project/captive/doc/Architecture.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: Architecture',
                "rel_prev"=>'About.pm',

diff --git a/project/captive/doc/CacheManager.pm b/project/captive/doc/CacheManager.pm
index 82197bc..c9728bf 100755 (executable)
--- a/project/captive/doc/CacheManager.pm
+++ b/project/captive/doc/CacheManager.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: NT Cache Manager',
                "rel_prev"=>'Reverse.pm',

diff --git a/project/captive/doc/CallType.pm b/project/captive/doc/CallType.pm
index 8f80e99..e7f1b46 100755 (executable)
--- a/project/captive/doc/CallType.pm
+++ b/project/captive/doc/CallType.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: API Calling Conventions',
                "rel_prev"=>'APITypes.pm',

diff --git a/project/captive/doc/Components.pm b/project/captive/doc/Components.pm
index 4234b9a..1813e76 100755 (executable)
--- a/project/captive/doc/Components.pm
+++ b/project/captive/doc/Components.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "__PACKAGE__"=>__PACKAGE__,
                "title"=>'Captive NTFS Developer Documentation: Components',

diff --git a/project/captive/doc/Details.pm b/project/captive/doc/Details.pm
index f0c1d81..6e7633f 100755 (executable)
--- a/project/captive/doc/Details.pm
+++ b/project/captive/doc/Details.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "__PACKAGE__"=>__PACKAGE__,
                "title"=>'Captive NTFS Developer Documentation: Implementation Details',

diff --git a/project/captive/doc/Index.pm b/project/captive/doc/Index.pm
index a424be9..5ddc4ff 100755 (executable)
--- a/project/captive/doc/Index.pm
+++ b/project/captive/doc/Index.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation',
                "rel_next"=>'About.pm',

diff --git a/project/captive/doc/LinuxNTFS.pm b/project/captive/doc/LinuxNTFS.pm
index 3a022c5..df31dd8 100755 (executable)
--- a/project/captive/doc/LinuxNTFS.pm
+++ b/project/captive/doc/LinuxNTFS.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: Captive vs. Linux-NTFS',
                "rel_prev"=>'Related.pm',

diff --git a/project/captive/doc/Macros.pm b/project/captive/doc/Macros.pm
index 007c15e..3538249 100755 (executable)
--- a/project/captive/doc/Macros.pm
+++ b/project/captive/doc/Macros.pm
@@ -105,6 +105,7 @@ sub init ($%)
 {
 my($class,%args)=@_;
 
+       $args{"__PACKAGE__"}||=caller();
        %args=(
                        "rel_start"=>"..",
                        "rel_up"=>".",

diff --git a/project/captive/doc/Related.pm b/project/captive/doc/Related.pm
index 6a39a51..d9c68a0 100755 (executable)
--- a/project/captive/doc/Related.pm
+++ b/project/captive/doc/Related.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: Related Projects',
                "rel_prev"=>'TODO.pm',

diff --git a/project/captive/doc/Reverse.pm b/project/captive/doc/Reverse.pm
index d048b20..f341909 100755 (executable)
--- a/project/captive/doc/Reverse.pm
+++ b/project/captive/doc/Reverse.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: Reverse Engineering',
                "rel_prev"=>'Components.pm',

diff --git a/project/captive/doc/TODO.pm b/project/captive/doc/TODO.pm
index 61cf08c..999ef03 100755 (executable)
--- a/project/captive/doc/TODO.pm
+++ b/project/captive/doc/TODO.pm
@@ -25,11 +25,11 @@ use warnings;
 
 use My::Web;
 require CGI;
-BEGIN { Wuse 'project::captive::doc::Macros'; }
 
 
 sub handler
 {
+       BEGIN { Wuse 'project::captive::doc::Macros'; }
 project::captive::doc::Macros->init(
                "title"=>'Captive NTFS Developer Documentation: TODO',
                "rel_prev"=>'CallType.pm',