From 0f44bbcfd184be6fcea542d8d6431b55944ccaf2 Mon Sep 17 00:00:00 2001
From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Mon, 26 Mar 2012 09:51:34 -0400
Subject: [PATCH] Just a little syntax cleanup and the like to make things run
 as intended

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---
 Open-ILS/examples/apache/startup.pl                |  2 +-
 .../src/perlmods/lib/OpenILS/WWW/FlatFielder.pm    | 48 ++++++++++++----------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/examples/apache/startup.pl b/Open-ILS/examples/apache/startup.pl
index 46df1b11ac..f7755b6f35 100755
--- a/Open-ILS/examples/apache/startup.pl
+++ b/Open-ILS/examples/apache/startup.pl
@@ -13,7 +13,7 @@ use OpenILS::WWW::TemplateBatchBibUpdate qw( /openils/conf/opensrf_core.xml );
 use OpenILS::WWW::EGWeb;
 use OpenILS::WWW::PasswordReset ('/openils/conf/opensrf_core.xml');
 use OpenILS::WWW::IDL2js ('/openils/conf/opensrf_core.xml');
-use OpenILS::WWW::FlatFielder ('/openils/conf/opensrf_core.xml');
+use OpenILS::WWW::FlatFielder;
 
 # - Uncoment the following 2 lines to make use of the IP redirection code
 # - The IP file should to contain a map with the following format:
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm
index 6151bb79a1..03d8a8be92 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/FlatFielder.pm
@@ -25,18 +25,18 @@ my $_output_handler_dispatch = {
     "application/xml" => {
         "prio" => 0,
         "code" => sub {
-            my ($r, $data) = @_;
+            my ($r, $args) = @_;
             $r->content_type("application/xml; charset=utf-8");
-            print data_to_xml($data);
+            print data_to_xml($args);
             return Apache2::Const::OK;
         }
     },
     "application/json" => {
         "prio" => 1,
         "code" => sub {
-            my ($r, $data) = @_;
+            my ($r, $args) = @_;
             $r->content_type("application/json; charset=utf-8");
-            print data_to_json($data);
+            print data_to_json($args);
             return Apache2::Const::OK;
         }
     }
@@ -50,7 +50,7 @@ my @_output_handler_types = sort {
 # END package globals
 
 sub data_to_xml {
-    my ($data) = @_;
+    my ($args) = @_;
 
     my $dom = new XML::LibXML::Document("1.0", "UTF-8");
     my $fs = $dom->createElement("FlatSearch");
@@ -79,10 +79,10 @@ sub data_to_json {
     my ($args) = @_;
 
     return OpenSRF::Utils::JSON->perl2JSON({
-        ($$args{hint} ? (hint => $$args{hint}) : ())
-        ($$args{identifier_field} ? (identifier => $$args{identifier_field}) : ())
-        ($$args{label_field} ? (label => $$args{label_field}) : ())
-        ($$args{key} ? (FS_key => $$args{key}) : ())
+        ($$args{hint} ? (hint => $$args{hint}) : ()),
+        ($$args{identifier_field} ? (identifier => $$args{identifier_field}) : ()),
+        ($$args{label_field} ? (label => $$args{label_field}) : ()),
+        ($$args{key} ? (FS_key => $$args{key}) : ()),
         items => $$args{data}
     });
 }
@@ -120,21 +120,27 @@ sub handler {
     my $cgi = new CGI;
 
     my %args;
-    my $args{format} = $cgi->param('format');
-    my $args{auth} = $cgi->param('ses');
-    my $args{hint} = $cgi->param('hint');
-    my $args{map} = OpenSRF::Utils::JSON->JSON2perl($cgi->param('map'));
-    my $args{where} = OpenSRF::Utils::JSON->JSON2perl($cgi->param('where'));
-    my $args{slo} = OpenSRF::Utils::JSON->JSON2perl($cgi->param('slo'));
-    my $args{key} = $cgi->param('key');
-    my $args{id_field} = $cgi->param('identifier');
-    my $args{label_field} = $cgi->param('label');
+    $args{format} = $cgi->param('format');
+    $args{auth} = $cgi->param('ses');
+    $args{hint} = $cgi->param('hint');
+    $args{map} = OpenSRF::Utils::JSON->JSON2perl($cgi->param('map'));
+    $args{where} = OpenSRF::Utils::JSON->JSON2perl($cgi->param('where'));
+    $args{slo} = OpenSRF::Utils::JSON->JSON2perl($cgi->param('slo'));
+    $args{key} = $cgi->param('key');
+    $args{id_field} = $cgi->param('identifier');
+    $args{label_field} = $cgi->param('label');
 
     my $fielder = OpenSRF::AppSession->create('open-ils.fielder');
-    if ($map) {
-        $args{data} = $fielder->request('open-ils.fielder.flattened_search.atomic', $auth, $hint, $map, $where, $slo )->gather(1);
+    if ($args{map}) {
+        $args{data} = $fielder->request(
+            'open-ils.fielder.flattened_search.atomic',
+            @args{qw/auth hint map where slo/}
+        )->gather(1);
     } else {
-        $args{data} = $fielder->request('open-ils.fielder.flattened_search.execute.atomic', $auth, $key, $where, $slo )->gather(1);
+        $args{data} = $fielder->request(
+            'open-ils.fielder.flattened_search.execute.atomic',
+            @args{qw/auth key where slo/}
+        )->gather(1);
     }
 
     return output_handler( $r, \%args );
-- 
2.11.0