[haver-commits] r679 - in trunk: . main/core/lib/Haver/Base

[haver]

Author: dylan
Date: 2005-05-10 04:16:59 -0400 (Tue, 10 May 2005)
New Revision: 679

Modified:
   trunk/
   trunk/main/core/lib/Haver/Base/Session.pm
Log:
 [EMAIL PROTECTED]:  dylan | 2005-05-10 03:57:14 -0400
 Okay, no more spiffy source filtering for session classes.



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:951
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
   + 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:953
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/main/core/lib/Haver/Base/Session.pm
===================================================================
--- trunk/main/core/lib/Haver/Base/Session.pm   2005-05-09 18:12:22 UTC (rev 
678)
+++ trunk/main/core/lib/Haver/Base/Session.pm   2005-05-10 08:16:59 UTC (rev 
679)
@@ -2,8 +2,9 @@
 # This module is copyrighted, see end of file for details.
 package Haver::Base::Session;
 use Haver::Base '-Base';
+use POE::Session;
 
-our $VERSION = 0.05;
+our $VERSION = 0.06;
 our @EXPORT_BASE = qw(
        SESSION
        KERNEL HEAP STATE
@@ -16,34 +17,23 @@
        Log
 );
 
-BEGIN { require POE::Session };
-use constant {
-       SESSION => POE::Session::SESSION - 1,
-       KERNEL => POE::Session::KERNEL - 1,
-       HEAP => POE::Session::HEAP - 1,
-       STATE => POE::Session::STATE - 1,
-       SENDER => POE::Session::SENDER - 1,
-       CALLER_FILE => POE::Session::CALLER_FILE - 1,
-       CALLER_LINE => POE::Session::CALLER_LINE - 1,
-       ARG0 => POE::Session::ARG0 - 1,
-       ARG1 => POE::Session::ARG1 - 1,
-       ARG2 => POE::Session::ARG2 - 1,
-       ARG3 => POE::Session::ARG3 - 1,
-       ARG4 => POE::Session::ARG4 - 1,
-       ARG5 => POE::Session::ARG5 - 1,
-       ARG6 => POE::Session::ARG6 - 1,
-       ARG7 => POE::Session::ARG7 - 1,
-       ARG8 => POE::Session::ARG8 - 1,
-       ARG9 => POE::Session::ARG9 - 1,
-};
 
+sub import (@) {
+       if (grep /^-(Base|selfless)$/, @_) {
+               croak "Haver::Base::Session subclasses may not use -Base or 
-selfless!";
+       }
+       my $package = caller();
+       shift->SUPER::import(-package => $package, @_);
+}
 
-
 sub Log (@) {
        if (@_ == 1) {
-               $POE::Kernel::poe_kernel->post('Logger', 'debug', @_);
+               #$POE::Kernel::poe_kernel->post('Logger', 'debug', @_);
+               print "[debug] ", @_, "\n";
        } elsif (@_ > 1) {
-               $POE::Kernel::poe_kernel->post('Logger', @_);
+               #$POE::Kernel::poe_kernel->post('Logger', @_);
+               my $s = shift;
+               print "[$s] ", @_, "\n";
        } else {
                croak 'Log() must be called with >= 1 arguments';
        }
@@ -57,7 +47,7 @@
                "${what}_states" => [
                        $this => $this->declared_states,
                ],
-               args => [ @_ ],
+               args => [ { @_ } ],
        )
 }