Merge remote-tracking branch 'origin/new/bug_6836'

[koha.git] / patroncards / members-search.pl

diff --git a/patroncards/members-search.pl b/patroncards/members-search.pl
index 576ed30..dfa0462 100755 (executable)
--- a/patroncards/members-search.pl
+++ b/patroncards/members-search.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -49,17 +49,9 @@ $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
 
 if ($member || $category) {
-    my ($count,$results) = 0,0;
-
-    if(length($member) == 1)
-    {
-        ($count,$results) = SearchMember($member,$orderby,"simple");
-    }
-    else
-    {
-        ($count,$results) = SearchMember($member,$orderby,"advanced",$category);
-    }
-
+    my $results = $category ? Search({''=>$member, category_type=>$category}, $orderby)
+                            : Search($member, $orderby);
+    my $count = $results ? @$results : 0;
 
     my @resultsdata = ();
     my $to = ($count>($startfrom * $resultsperpage)?$startfrom * $resultsperpage:$count);
@@ -92,7 +84,7 @@ if ($member || $category) {
         );
         push(@resultsdata, \%row);
     }
-    my $base_url = __FILE__ . '?' . join('&', map { $_->{term} . ' = ' . $_->{val} } (
+    my $base_url = '?' . join('&', map { $_->{term} . '=' . $_->{val} } (
                                             { term => 'member',         val => $member         },
                                             { term => 'category',       val => $category       },
                                             { term => 'orderby',        val => $orderby        },