From 61604b73fd29005be984d27d3f668895cfd96203 Mon Sep 17 00:00:00 2001
From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Wed, 9 Feb 2005 20:52:17 +0000
Subject: [PATCH] fixing subrequest support

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@40 9efc2488-bf62-4759-914b-345cdb29e865
---
 src/perlmods/OpenSRF/Application.pm           | 22 +++++++++++++++----
 src/perlmods/OpenSRF/Application/Demo/Math.pm |  8 +++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/perlmods/OpenSRF/Application.pm b/src/perlmods/OpenSRF/Application.pm
index 4648b6b..448fd5d 100644
--- a/src/perlmods/OpenSRF/Application.pm
+++ b/src/perlmods/OpenSRF/Application.pm
@@ -4,6 +4,7 @@ use OpenSRF::AppSession;
 use OpenSRF::DomainObject::oilsMethod;
 use OpenSRF::DomainObject::oilsResponse qw/:status/;
 use OpenSRF::Utils::Logger qw/:level/;
+use Data::Dumper;
 use Time::HiRes qw/time/;
 use vars qw/$_app $log %_METHODS/;
 use OpenSRF::EX qw/:try/;
@@ -198,14 +199,18 @@ sub register_method {
 sub method_lookup {             
 	my $self = shift;
 	my $method = shift;
-	my $proto = shift;
+	my $proto = shift || 1;
 
 	my $class = ref($self) || $self;
 
-	$log->debug("Specialized lookup of [$method] in [$class]", INTERNAL);
+	$log->debug("Specialized lookup of [$method] in [$class]", DEBUG);
+	$log->debug("Available methods\n".Dumper(\%_METHODS), INTERNAL);
 
 	if (exists $_METHODS{$method}) {
-		return $_METHODS{$method} if ($_METHODS{$method}{protocol} == $proto);
+		$log->debug("Looks like we found [$method]", DEBUG);
+		my $meth = $_METHODS{$method} if ($_METHODS{$method}{protocol} == $proto);
+		$log->debug("Method object is ".Dumper($meth), INTERNAL);
+		return $meth;
 	}               
 
 	return undef; 
@@ -215,15 +220,24 @@ sub run {
 	my $self = shift;
 	my $req = shift;
 
-	unless ( ref($req) and UNIVERSAL::isa($req, 'OpenSRF::AppRequest') ) {
+	if ( !ref($req) || !UNIVERSAL::isa($req, 'OpenSRF::AppRequest') ) {
+		$log->debug("Creating a SubRequest object", DEBUG);
 		unshift @_, $req;
 		$req = OpenSRF::AppSubrequest->new;
+	} else {
+		$log->debug("This is a top level request", DEBUG);
 	}
 
 	my $resp = $self->{code}->($self, $req, @_);
 
 	if ( ref($req) and UNIVERSAL::isa($req, 'OpenSRF::AppSubrequest') ) {
+		$req->respond($resp) if ($resp);
+		for my $r ( $req->responses ) {
+			$log->debug("A SubRequest object is responding with $r", DEBUG);
+		}
 		return $req->responses;
+	} else {
+		$log->debug("A top level Request object is responding $resp", DEBUG);
 	}
 
 	return $resp;
diff --git a/src/perlmods/OpenSRF/Application/Demo/Math.pm b/src/perlmods/OpenSRF/Application/Demo/Math.pm
index 2f220c9..a895bb1 100644
--- a/src/perlmods/OpenSRF/Application/Demo/Math.pm
+++ b/src/perlmods/OpenSRF/Application/Demo/Math.pm
@@ -82,7 +82,7 @@ sub add_1 {
 	my @args = @_;
 
 	my $meth = $self->method_lookup('_send_request');
-	my $result = $meth->run('add',@args);
+	my ($result) = $meth->run('add',@args);
 
 	return $result;
 	
@@ -96,7 +96,7 @@ sub sub_1 {
 	my @args = @_;
 
 	my $meth = $self->method_lookup('_send_request');
-	my $result = $meth->run('sub',@args);
+	my ($result) = $meth->run('sub',@args);
 
 	return $result;
 	
@@ -110,7 +110,7 @@ sub mult_1 {
 	my @args = @_;
 
 	my $meth = $self->method_lookup('_send_request');
-	my $result = $meth->run('mult',@args);
+	my ($result) = $meth->run('mult',@args);
 
 	return $result;
 	
@@ -124,7 +124,7 @@ sub div_1 {
 	my @args = @_;
 
 	my $meth = $self->method_lookup('_send_request');
-	my $result = $meth->run('div',@args);
+	my ($result) = $meth->run('div',@args);
 
 	return $result;
 	
-- 
2.43.2