-# $Id: 14-sorting.t,v 1.3 2005-11-04 16:59:55 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 => 27;
+use Test::More tests => 29;
use MARC::Record;
BEGIN { use_ok('Net::Z3950::ZOOM') };
my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
-my $host = "indexdata.com/gils";
+my $host = "z3950.indexdata.com/gils";
my $conn = Net::Z3950::ZOOM::connection_new($host, 0);
$errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
ok($errcode == 0, "connection to '$host'");
foreach my $i (1 .. $n) {
my $rec = Net::Z3950::ZOOM::resultset_record($rs, $i-1);
ok(defined $rec, "got record $i of $n");
- my $len = 0;
- my $raw = Net::Z3950::ZOOM::record_get($rec, "raw", $len);
+ my $raw = Net::Z3950::ZOOM::record_get($rec, "raw");
my $marc = new_from_usmarc MARC::Record($raw);
my $title = $marc->title();
ok($title ge $previous, "title '$title' ge previous '$previous'");
$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) {
my $rec = Net::Z3950::ZOOM::resultset_record($rs, $i-1);
ok(defined $rec, "got record $i of $n");
- my $len = 0;
- my $raw = Net::Z3950::ZOOM::record_get($rec, "raw", $len);
+ my $raw = Net::Z3950::ZOOM::record_get($rec, "raw");
my $marc = new_from_usmarc MARC::Record($raw);
my $title = $marc->title();
ok($title le $previous, "title '$title' le previous '$previous'");