From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 3 Oct 2012 17:57:20 +0000 (-0400)
Subject: Remove Switch (miker edition)
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4666ab656a64928a41a2cf641dcc49c1fa78a510;p=working%2FEvergreen.git

Remove Switch (miker edition)

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
index 1bdacac63b..7ded478467 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
@@ -7,7 +7,6 @@ use base 'QueryParser';
 use OpenSRF::Utils::JSON;
 use OpenILS::Application::AppUtils;
 use OpenILS::Utils::CStoreEditor;
-use Switch;
 my $U = 'OpenILS::Application::AppUtils';
 
 my ${spc} = ' ' x 2;
@@ -818,78 +817,65 @@ sub flatten {
             warn "flatten(): filter where => $where\n"
                 if $self->QueryParser->debug;
         } else {
-            switch ($filter->name) {
-                case 'before' {
-                    if (@{$filter->args} == 1) {
-                        $where .= $joiner if $where ne '(';
-                        $where .= "${NOT}COALESCE((mrd.attrs->'date1') <= " . $self->QueryParser->quote_value($filter->args->[0]) . ", false)";
-                    }
+            if ($filter->name eq  'before') {
+                if (@{$filter->args} == 1) {
+                    $where .= $joiner if $where ne '(';
+                    $where .= "${NOT}COALESCE((mrd.attrs->'date1') <= " . $self->QueryParser->quote_value($filter->args->[0]) . ", false)";
                 }
-                case 'after' {
-                    if (@{$filter->args} == 1) {
-                        $where .= $joiner if $where ne '(';
-                        $where .= "${NOT}COALESCE((mrd.attrs->'date1') >= " . $self->QueryParser->quote_value($filter->args->[0]) . ", false)";
-                    }
+            } elsif ($filter->name eq  'after') {
+                if (@{$filter->args} == 1) {
+                    $where .= $joiner if $where ne '(';
+                    $where .= "${NOT}COALESCE((mrd.attrs->'date1') >= " . $self->QueryParser->quote_value($filter->args->[0]) . ", false)";
                 }
-                case 'during' {
-                    if (@{$filter->args} == 1) {
-                        $where .= $joiner if $where ne '(';
-                        $where .= "${NOT}COALESCE(" . $self->QueryParser->quote_value($filter->args->[0]) . " BETWEEN (mrd.attrs->'date1') AND (mrd.attrs->'date2'), false)";
-                    }
+            } elsif ($filter->name eq  'during') {
+                if (@{$filter->args} == 1) {
+                    $where .= $joiner if $where ne '(';
+                    $where .= "${NOT}COALESCE(" . $self->QueryParser->quote_value($filter->args->[0]) . " BETWEEN (mrd.attrs->'date1') AND (mrd.attrs->'date2'), false)";
                 }
-                case 'between' {
-                    if (@{$filter->args} == 2) {
-                        $where .= $joiner if $where ne '(';
-                        $where .= "${NOT}COALESCE((mrd.attrs->'date1') BETWEEN " . $self->QueryParser->quote_value($filter->args->[0]) . " AND " . $self->QueryParser->quote_value($filter->args->[1]) . ", false)";
-                    }
+            } elsif ($filter->name eq  'between') {
+                if (@{$filter->args} == 2) {
+                    $where .= $joiner if $where ne '(';
+                    $where .= "${NOT}COALESCE((mrd.attrs->'date1') BETWEEN " . $self->QueryParser->quote_value($filter->args->[0]) . " AND " . $self->QueryParser->quote_value($filter->args->[1]) . ", false)";
                 }
-                case 'container' {
-                    if (@{$filter->args} >= 3) {
-                        my ($class, $ctype, $cid, $token) = @{$filter->args};
-                        my $perm_join = '';
-                        my $rec_join = '';
-                        my $rec_field = 'ci.target_biblio_record_entry';
-                        switch($class) {
-                            case 'bre' {
-                                $class = 'biblio_record_entry';
-                            }
-                            case 'acn' {
-                                $class = 'call_number';
-                                $rec_field = 'cn.record';
-                                $rec_join = 'JOIN asset.call_number cn ON (ci.target_call_number = cn.id)';
-                            }
-                            case 'acp' {
-                                $class = 'copy';
-                                $rec_field = 'cn.record';
-                                $rec_join = 'JOIN asset.copy cp ON (ci.target_copy = cp.id) JOIN asset.call_number cn ON (cp.call_number = cn.id)';
-                            }
-                            else {
-                                $class = undef;
-                            }
-                        }
-
-                        if ($class) {
-                            my ($u,$e) = $apputils->checksesperm($token) if ($token);
-                            $perm_join = ' OR c.owner = ' . $u->id if ($u && !$e);
-                            $where .= $joiner if $where ne '(';
-                            $where .= "${NOT}EXISTS(SELECT 1 FROM container.${class}_bucket_item ci JOIN container.${class}_bucket c ON (c.id = ci.bucket) $rec_join WHERE c.btype = " . $self->QueryParser->quote_value($ctype) . " AND c.id = " . $self->QueryParser->quote_value($cid) . " AND (c.pub IS TRUE$perm_join) AND $rec_field = m.source LIMIT 1)"
-                        }
+            } elsif ($filter->name eq  'container') {
+                if (@{$filter->args} >= 3) {
+                    my ($class, $ctype, $cid, $token) = @{$filter->args};
+                    my $perm_join = '';
+                    my $rec_join = '';
+                    my $rec_field = 'ci.target_biblio_record_entry';
+                    if ($class eq  'bre') {
+                        $class = 'biblio_record_entry';
+                    } elsif ($class eq  'acn') {
+                        $class = 'call_number';
+                        $rec_field = 'cn.record';
+                        $rec_join = 'JOIN asset.call_number cn ON (ci.target_call_number = cn.id)';
+                    } elsif ($class eq  'acp') {
+                        $class = 'copy';
+                        $rec_field = 'cn.record';
+                        $rec_join = 'JOIN asset.copy cp ON (ci.target_copy = cp.id) JOIN asset.call_number cn ON (cp.call_number = cn.id)';
+                    } else {
+                        $class = undef;
                     }
-                }
-                case 'record_list' {
-                    if (@{$filter->args} > 0) {
-                        my $key = 'm.source';
-                        $key = 'm.metarecord' if (grep {$_->name eq 'metarecord' or $_->name eq 'metabib'} @{$self->QueryParser->parse_tree->modifiers});
+
+                    if ($class) {
+                        my ($u,$e) = $apputils->checksesperm($token) if ($token);
+                        $perm_join = ' OR c.owner = ' . $u->id if ($u && !$e);
                         $where .= $joiner if $where ne '(';
-                        $where .= 'NOT ' if $filter->negate;
-                        $where .= "$key ${NOT}IN (" . join(',', map { $self->QueryParser->quote_value($_) } @{ $filter->args}) . ')';
+                        $where .= "${NOT}EXISTS(SELECT 1 FROM container.${class}_bucket_item ci JOIN container.${class}_bucket c ON (c.id = ci.bucket) $rec_join WHERE c.btype = " . $self->QueryParser->quote_value($ctype) . " AND c.id = " . $self->QueryParser->quote_value($cid) . " AND (c.pub IS TRUE$perm_join) AND $rec_field = m.source LIMIT 1)"
                     }
                 }
-                case 'bib_source' {
-                    if (@{$filter->args} > 0) {
-                        $where .= $joiner if $where ne '(';
-                        $where .= "${NOT}COALESCE(bre.source IN (" . join(',', map { $self->QueryParser->quote_value($_) } @{ $filter->args }) . "), false)";
-                    }
+            } elsif ($filter->name eq  'record_list') {
+                if (@{$filter->args} > 0) {
+                    my $key = 'm.source';
+                    $key = 'm.metarecord' if (grep {$_->name eq 'metarecord' or $_->name eq 'metabib'} @{$self->QueryParser->parse_tree->modifiers});
+                    $where .= $joiner if $where ne '(';
+                    $where .= 'NOT ' if $filter->negate;
+                    $where .= "$key ${NOT}IN (" . join(',', map { $self->QueryParser->quote_value($_) } @{ $filter->args}) . ')';
+                }
+            } elsif ($filter->name eq  'bib_source') {
+                if (@{$filter->args} > 0) {
+                    $where .= $joiner if $where ne '(';
+                    $where .= "${NOT}COALESCE(bre.source IN (" . join(',', map { $self->QueryParser->quote_value($_) } @{ $filter->args }) . "), false)";
                 }
             }
         }