-# $Id: 14-sorting.t,v 1.1 2005-11-04 16:13:42 mike Exp $
+# $Id: 14-sorting.t,v 1.6 2005-11-18 17:53:53 mike Exp $
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl 14-sorting.t'
-# ### At present, this test fails -- so far as I can see, because
-# the underlying ZOOM-C sorting functionality is broken, as
-# verified using "zoomsh" with the commands:
-#
-# ZOOM>open indexdata.dk/gils
-# ZOOM>find @attr 1=4 map
-# ZOOM>sort 1=4
-# ZOOM>show 0 5
-#
-# Hopefully Adam will fix the underlying code, and then this
-# will Just Work.
-
use strict;
use warnings;
-use Test::More tests => 26;
+use Test::More tests => 29;
use MARC::Record;
BEGIN { use_ok('Net::Z3950::ZOOM') };
my $qstr = '@attr 1=4 map';
my $query = Net::Z3950::ZOOM::query_create();
Net::Z3950::ZOOM::query_prefix($query, $qstr);
-Net::Z3950::ZOOM::query_sortby($query, "1=4<i");
+my $res = Net::Z3950::ZOOM::query_sortby($query, "1=4 <i");
+ok($res == 0, "sort specification accepted");
my $rs = Net::Z3950::ZOOM::connection_search($conn, $query);
$errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
ok($errcode == 0, "search for '$qstr'");
my $n = Net::Z3950::ZOOM::resultset_size($rs);
-ok($n eq 5, "found $n records (expected 5)");
+ok($n == 5, "found $n records (expected 5)");
Net::Z3950::ZOOM::resultset_option_set($rs, preferredRecordSyntax => "usmarc");
my $previous = ""; # Sorts before all legitimate titles
$previous = $title;
}
-# Now reverse the order of sorting
-Net::Z3950::ZOOM::resultset_sort($rs, "dummy", "1=4>i");
-### There's no way to check for success, as this is a void function
+# Now reverse the order of sorting. We never use resultset_sort(),
+# which is identical to sort1() except that it returns nothing.
+my $status = Net::Z3950::ZOOM::resultset_sort1($rs, "yaz", "1=4>i");
+ok($status < 0, "malformed sort criterion rejected");
+$status = Net::Z3950::ZOOM::resultset_sort1($rs, "yaz", "1=4 >i");
+ok($status == 0, "sort criterion accepted");
$previous = "z"; # Sorts after all legitimate titles
foreach my $i (1 .. $n) {