From aef0ca8d2879ae6dd09c6555867765d3bfede99a Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 6 Mar 2014 14:11:13 +1300
Subject: [PATCH] Continuing work on the AcceptItem handler

---
 lib/NCIP/Dancing.pm                       |  2 +-
 lib/NCIP/Handler/AcceptItem.pm            | 12 ++++++++++--
 templates/includes/AcceptItemResponse.inc |  9 ++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/NCIP/Dancing.pm b/lib/NCIP/Dancing.pm
index 8b65bc8..779c5a4 100644
--- a/lib/NCIP/Dancing.pm
+++ b/lib/NCIP/Dancing.pm
@@ -12,7 +12,7 @@ any [ 'get', 'post' ] => '/' => sub {
         $xml = request->body;
     }
     my $content = $ncip->process_request($xml);
-    warn $content;
+#    warn $content;
     template 'main', { content => $content };
 };
 
diff --git a/lib/NCIP/Handler/AcceptItem.pm b/lib/NCIP/Handler/AcceptItem.pm
index f744f4e..e1ea4eb 100644
--- a/lib/NCIP/Handler/AcceptItem.pm
+++ b/lib/NCIP/Handler/AcceptItem.pm
@@ -25,9 +25,14 @@ sub handle {
     if ($xmldoc) {
         my $root = $xmldoc->documentElement();
         my $xpc  = $self->xpc();
-        my $itemid = $xpc->findnodes( '//ns:ItemId', $root );
+        my $itemid =
+          $xpc->findnodes( '//ns:ItemId/ItemIdentifierValue', $root );
+        my ($action)  = $xpc->findnodes( '//ns:RequestedActionType', $root );
+        my ($request) = $xpc->findnodes( '//ns:RequestId',           $root );
+        my $requestagency = $xpc->find( 'ns:AgencyId', $request );
+        my $requestid = $xpc->find( '//ns:RequestIdentifierValue', $request );
 
-        # checkin the item
+        # accept the item
         my $accepted = $self->ils->acceptitem($itemid);
         my $output;
         my $vars;
@@ -48,6 +53,9 @@ sub handle {
         }
         else {
             my $elements = $self->get_user_elements($xmldoc);
+            $vars->{'requestagency'} = $requestagency;
+            $vars->{'requestid'}     = $requestid;
+
             $vars->{'elements'} = $elements;
             $vars->{'accept'}   = $accepted;
             $output = $self->render_output( 'response.tt', $vars );
diff --git a/templates/includes/AcceptItemResponse.inc b/templates/includes/AcceptItemResponse.inc
index 29cc1e2..5b30807 100644
--- a/templates/includes/AcceptItemResponse.inc
+++ b/templates/includes/AcceptItemResponse.inc
@@ -1 +1,8 @@
-<ItemId>[% barcode %]</ItemId>
+<RequestId>
+  <AgencyId>[% requestagency %]</AgencyId>
+  <RequestIdentifierValue>[% requestid %]</RequestIdentifierValue>
+</RequestId>
+<ItemId>
+  <ItemIdentifierType>Item Barcode</ItemIdentifierType>
+  <ItemIdentifierValue>[% newbarcode %]</ItemIdentifierValue>
+</ItemId>
-- 
2.43.2