Rolling.

[ZOOM-Perl-moved-to-github.git] / lib / ZOOM.pm

diff --git a/lib/ZOOM.pm b/lib/ZOOM.pm
index b0a3792..2baf1d3 100644 (file)
--- a/lib/ZOOM.pm
+++ b/lib/ZOOM.pm
@@ -1,4 +1,4 @@
-# $Id: ZOOM.pm,v 1.15 2005-11-08 15:55:45 mike Exp $
+# $Id: ZOOM.pm,v 1.18 2005-11-16 14:49:30 mike Exp $
 
 use strict;
 use warnings;
@@ -124,6 +124,15 @@ sub addinfo {
     return $this->{addinfo};
 }
 
+sub render {
+    my $this = shift();
+    my $res = "ZOOM error " . $this->code() . ' "' . $this->message() . '"';
+    $res .= ' (addinfo: "' . $this->addinfo() . '")' if $this->addinfo();
+    return $res;
+}
+
+# This means that untrapped exceptions render nicely.
+use overload '""' => \&render;
 
 # ----------------------------------------------------------------------------
 
@@ -255,7 +264,7 @@ sub new {
     my $class = shift();
     my($host, $port) = @_;
 
-    my $_conn = Net::Z3950::ZOOM::connection_new($host, $port);
+    my $_conn = Net::Z3950::ZOOM::connection_new($host, $port || 0);
     my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
     $errcode = Net::Z3950::ZOOM::connection_error($_conn, $errmsg, $addinfo);
     die new ZOOM::Exception($errcode, $errmsg, $addinfo) if $errcode;
@@ -575,6 +584,7 @@ sub records {
 
     my $raw = Net::Z3950::ZOOM::resultset_records($this->_rs(), $start, $count,
                                                  $return_records);
+    ### Why don't we throw an exception if $raw is undefined?
     return undef if !defined $raw;
 
     # We need to package up the returned records in ZOOM::Record objects
@@ -595,8 +605,8 @@ sub sort {
     my $this = shift();
     my($sort_type, $sort_spec) = @_;
 
-    Net::Z3950::ZOOM::resultset_sort($this->_rs(), $sort_type, $sort_spec);
-    ### There's no way to check for success, as this is a void function
+    return Net::Z3950::ZOOM::resultset_sort1($this->_rs(),
+                                            $sort_type, $sort_spec);
 }
 
 sub destroy {
@@ -714,6 +724,17 @@ sub _ss {
     return $_ss;
 }
 
+sub option {
+    my $this = shift();
+    my($key, $value) = @_;
+
+    my $oldval = Net::Z3950::ZOOM::scanset_option_get($this->_ss(), $key);
+    Net::Z3950::ZOOM::scanset_option_set($this->_ss(), $key, $value)
+       if defined $value;
+
+    return $oldval;
+}
+
 sub size {
     my $this = shift();
 
@@ -727,6 +748,7 @@ sub term {
     my($occ, $len) = (0, 0);
     my $term = Net::Z3950::ZOOM::scanset_term($this->_ss(), $which,
                                              $occ, $len);
+    ### Throw exception?
     return undef if !defined $term;
     die "length of term '$term' differs from returned len=$len"
        if length($term) != $len;
@@ -741,6 +763,7 @@ sub display_term {
     my($occ, $len) = (0, 0);
     my $term = Net::Z3950::ZOOM::scanset_display_term($this->_ss(), $which,
                                                      $occ, $len);
+    ### Throw exception?
     return undef if !defined $term;
     die "length of display term '$term' differs from returned len=$len"
        if length($term) != $len;