made checkout methods take hash refs instead of named params list since

named params don't make sense in a non-Perl environment

removed bogus Perlisms from the JS file

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2887 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
index 3d38b8f..1249ee9 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_permit_copy.js
@@ -41,8 +41,8 @@ if( status != 'available' && status != 'on holds shelf' )
        return result.event = 'COPY_NOT_AVAILABLE';
 
 var holds = copy.fetchHold();
-for( my i in holds ) {
-       my hold = holds[i];
+for( var i in holds ) {
+       var hold = holds[i];
        if( hold && hold.usr != patron.id )
                return result.event = 'COPY_NEEDED_FOR_HOLD';
 }

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
index 3b9424c..afa19c8 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
@@ -193,7 +193,7 @@ __PACKAGE__->register_method(
        signature       =>      q/
                Creates an in-house use action.
                @param $authtoken The login session key
-               @param params A named list of params including
+               @param params A hash of params including
                        'location' The org unit id where the in-house use occurs
                        'copyid' The copy in question
                        'count' The number of in-house uses to apply to this copy
@@ -202,12 +202,12 @@ __PACKAGE__->register_method(
        /);
 
 sub create_in_house_use {
-       my( $self, $client, $authtoken, %params ) = @_;
+       my( $self, $client, $authtoken, $params ) = @_;
 
        my( $staff, $evt, $copy );
-       my $org         = $params{location};
-       my $copyid      = $params{copyid};
-       my $count       = $params{count} || 1;
+       my $org         = $params->{location};
+       my $copyid      = $params->{copyid};
+       my $count       = $params->{count} || 1;
 
        ($staff, $evt) = $U->checkses($authtoken);
        return $evt if $evt;

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
index 52f146c..5eeacaa 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
@@ -292,7 +292,7 @@ __PACKAGE__->register_method(
        notes           => q/
                Determines if the given checkout can occur
                @param authtoken The login session key
-               @param params A trailing list of named params including 
+               @param params A trailing hash of named params including 
                        barcode : The copy barcode, 
                        patron : The patron the checkout is occurring for, 
                        renew : true or false - whether or not this is a renewal
@@ -301,18 +301,18 @@ __PACKAGE__->register_method(
        /);
 
 sub permit_circ {
-       my( $self, $client, $authtoken, %params ) = @_;
+       my( $self, $client, $authtoken, $params ) = @_;
 
        my ( $requestor, $patron, $ctx, $evt );
 
        # check permisson of the requestor
        ( $requestor, $patron, $evt ) = 
                $apputils->checkses_requestor( 
-               $authtoken, $params{patron}, 'VIEW_PERMIT_CHECKOUT' );
+               $authtoken, $params->{patron}, 'VIEW_PERMIT_CHECKOUT' );
        return $evt if $evt;
 
        # fetch and build the circulation environment
-       ( $ctx, $evt ) = create_circ_ctx( %params, 
+       ( $ctx, $evt ) = create_circ_ctx( %$params, 
                patron                                                  => $patron, 
                type                                                            => 'permit',
                fetch_patron_circ_summary       => 1,
@@ -362,7 +362,7 @@ __PACKAGE__->register_method(
        notes => q/
                Checks out an item
                @param authtoken The login session key
-               @param params A named list of params including:
+               @param params A named hash of params including:
                        copy                    The copy object
                        barcode         If no copy is provided, the copy is retrieved via barcode
                        copyid          If no copy or barcode is provide, the copy id will be use
@@ -375,20 +375,20 @@ __PACKAGE__->register_method(
        /);
 
 sub checkout {
-       my( $self, $client, $authtoken, %params ) = @_;
+       my( $self, $client, $authtoken, $params ) = @_;
 
        my ( $requestor, $patron, $ctx, $evt );
 
        # check permisson of the requestor
        ( $requestor, $patron, $evt ) = 
                $apputils->checkses_requestor( 
-                       $authtoken, $params{patron}, 'COPY_CHECKOUT' );
+                       $authtoken, $params->{patron}, 'COPY_CHECKOUT' );
        return $evt if $evt;
 
-       return _checkout_noncat( $requestor, $patron, %params ) if $params{noncat};
+       return _checkout_noncat( $requestor, $patron, %$params ) if $params->{noncat};
 
        # fetch and build the circulation environment
-       ( $ctx, $evt ) = create_circ_ctx( %params, 
+       ( $ctx, $evt ) = create_circ_ctx( %$params, 
                patron                                                  => $patron, 
                type                                                            => 'checkout',
                fetch_patron_circ_summary       => 1,
@@ -440,7 +440,7 @@ __PACKAGE__->register_method(
        NOTES
 
 sub checkin {
-       my( $self, $client, $authtoken, %params ) = @_;
+       my( $self, $client, $authtoken, $params ) = @_;
        my $barcode             = $params{barcode};
 }
 
@@ -458,7 +458,7 @@ __PACKAGE__->register_method(
        NOTES
 
 sub renew {
-       my( $self, $client, $authtoken, %params ) = @_;
+       my( $self, $client, $authtoken, $params ) = @_;
        my $circ        = $params{circ};
 }
 

diff --git a/Open-ILS/src/support-scripts/test-scripts/checkout.pl b/Open-ILS/src/support-scripts/test-scripts/checkout.pl
index 7e20b0b..c8fd6fb 100755 (executable)
--- a/Open-ILS/src/support-scripts/test-scripts/checkout.pl
+++ b/Open-ILS/src/support-scripts/test-scripts/checkout.pl
@@ -15,7 +15,7 @@ err("\nusage: $0 <config> <oils_login_username> ".
        "\t'permit' to run the permit only\n".
        "\t'noncat_permit' to run the permit script against a noncat item\n".
        "\t'noncat' to check out a noncat item\n".
-       "\t(blank) to do a regular checkout\n" ) unless $ARGV[5];
+       "\t(blank) to do a regular checkout\n" ) unless $ARGV[4];
 #----------------------------------------------------------------
 
 my $config             = shift; 
@@ -23,7 +23,7 @@ my $username  = shift;
 my $password   = shift;
 my $patronid   = shift;
 my $barcode            = shift;
-my $type                       = shift;
+my $type                       = shift || "";
 my $nc_type            = shift;
 
 sub go {
@@ -41,12 +41,16 @@ go();
 sub do_permit {
        my( $patronid, $barcode, $noncat ) = @_;
 
-       my @args = ( $authtoken, 'patron', $patronid );
-       push(@args, (barcode => $barcode)) unless $noncat;
-       push(@args, (noncat => 1, noncat_type => $nc_type) ) if $noncat;
+       my $args = { patron => $patronid };
+
+       $args->{barcode} = $barcode;
+       if($noncat) {
+               $args->{noncat} = 1;
+               $args->{noncat_type} = $nc_type;
+       }
 
        my $resp = simplereq( 
-               CIRC(), 'open-ils.circ.checkout.permit', @args );
+               CIRC(), 'open-ils.circ.checkout.permit', $authtoken, $args );
        
        oils_event_die($resp);
        printl("Permit succeeded for patron $patronid");
@@ -55,13 +59,17 @@ sub do_permit {
 sub do_checkout {
        my( $patronid, $barcode, $noncat, $nc_type ) = @_;
 
-       my @args = ($authtoken, 'patron', $patronid);
-       push(@args, (barcode => $barcode)) unless $noncat;
-       push(@args, noncat => 1, noncat_type => $nc_type ) if $noncat;
+       my $args = { patron => $patronid };
+       $args->{barcode} = $barcode;
+       if($noncat) {
+               $args->{noncat} = 1;
+               $args->{noncat_type} = $nc_type;
+       }
 
        my $resp = osrf_request(
                'open-ils.circ', 
-               'open-ils.circ.checkout', @args );
+               'open-ils.circ.checkout', $authtoken, $args );
+
        oils_event_die($resp);
        printl("Checkout succeeded");
 }

diff --git a/Open-ILS/src/support-scripts/test-scripts/in_house_use.pl b/Open-ILS/src/support-scripts/test-scripts/in_house_use.pl
index 375f6b6..74cfb03 100755 (executable)
--- a/Open-ILS/src/support-scripts/test-scripts/in_house_use.pl
+++ b/Open-ILS/src/support-scripts/test-scripts/in_house_use.pl
@@ -40,9 +40,9 @@ sub do_in_house_use {
        my $resp = simplereq(
                'open-ils.circ',
                'open-ils.circ.in_house_use.create', $authtoken, 
-               copyid  => $copyid, 
-               location        => $location, 
-               count           => $count );
+               {       copyid  => $copyid, 
+                       location        => $location, 
+                       count           => $count } );
 
        oils_event_die($resp);
        printl("Successfully created " . scalar(@$resp) . " in house \n".