X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FBath.pm;h=80a96458926f22cff51135b7d43331d2f2f6a1ee;hb=HEAD;hp=4dcd7972c1986169759d6322e6e159bb71199326;hpb=293ed9776f307a90df03c10e7533532b1381b348;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Search/Bath.pm b/lib/ZOOM/IRSpy/Test/Search/Bath.pm
index 4dcd797..80a9645 100644
--- a/lib/ZOOM/IRSpy/Test/Search/Bath.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Bath.pm
@@ -3,6 +3,10 @@
 # Specifically section 5.A.0 ("Functional Area A: Level 0 Basic
 # Bibliographic Search and Retrieval") and its subsections:
 #	http://www.collectionscanada.gc.ca/bath/tp-bath2.7-e.htm#a
+# And section 5.A.1 ("Functional Area A: Level 1 Bibliographic Search
+# and Retrieval") and subsections 14 (Standard Identifier Search) and
+# 15 (Date of Publication Search):
+#	http://www.collectionscanada.gc.ca/bath/tp-bath2.10-e.htm#b
 #
 # The Bath Level 0 searches have different access-points, but share:
 #	Relation (2)		3	equal
@@ -14,12 +18,19 @@
 #	http://bugzilla.indexdata.dk/show_bug.cgi?id=3352#c0
 # wants use to use s=al t=r,l, where "s" is structure (4) and "al" is
 # AND-list, which apparently sends NO structure attribute; and "t" is
-# truncation (5) and "r,l" is right-and-left truncation (3).
+# truncation (5) and "r,l" is right-and-left truncation.
 #
 # AND-listing (and selection of word or phrase-structure) is now
-# invoked in the Toroid, when the list of attributes is emitted; but
-# we can't test for 5=100 here, as the Bath Profile says to do, and
-# then use that as justification for emitting 5=3 in the Toroid.
+# invoked in the Toroid, when the list of attributes is emitted; we
+# test for we can't test for 5=100 here, as the Bath Profile says to
+# do, and rather optimistically use that as justification for emitting
+# t=l,r in the Toroid (which means that individual queries can request
+# either left- or right-truncation using "?".
+#
+# Finally, we also make a test for "X-isbn", an ISBN number search,
+# which is not actually in the Bath Profile.  This gives us something
+# to back down to when the more general Standard Identifier search
+# isn't supported.
 
 package ZOOM::IRSpy::Test::Search::Bath;
 
@@ -34,10 +45,25 @@ use ZOOM::IRSpy::Utils qw(isodate);
 
 
 my @bath_queries = (
-    [ author =>  1003 ],	# 5.A.0.1
-    [ title =>   4 ],	# 5.A.0.2
-    [ subject => 21 ],	# 5.A.0.3
-    [ any =>     1016 ],	# 5.A.0.4
+    # Name    =>  use, rel, pos, str, tru, com
+    [ author  => 1003,   3,   3,   2, 100,   1 ],	# 5.A.0.1
+    [ title   =>    4,   3,   3,   2, 100,   1 ],	# 5.A.0.2
+    [ subject =>   21,   3,   3,   2, 100,   1 ],	# 5.A.0.3
+    [ any     => 1016,   3,   3,   2, 100,   1 ],	# 5.A.0.4
+    [ ident   => 1007,   3,   1,   1, 100,   1 ],	# 5.A.1.14
+    [ date    =>   31,   3,   1,   4, 100,   1 ],	# 5.A.1.15
+    [ "X-isbn"=>    7,   3,   1,   1, 100,   1 ],	# Not in Bath Profile
+
+    # Use attribute only -- fallbacks for when True Bath queries fail
+    [ "X-author1"    => 1 ],
+    [ "X-author1003" => 1003 ],
+    [ "X-author1004" => 1004 ],
+    [ "X-title"      => 4 ],
+    [ "X-subject"    => 21 ],
+    [ "X-any1016"    => 1016 ],
+    [ "X-any1017"    => 1017 ],
+    [ "X-any1035"    => 1035 ],
+    [ "X-isbn7"      => 7 ],
     );
 
 
@@ -56,9 +82,14 @@ sub start_search {
 	if $qindex >= @bath_queries;
 
     my $ref = $bath_queries[$qindex];
-    my($name, $use_attr) = @$ref;
+    my($name, @attrs) = @$ref;
+
+    my $query = "the";
+    foreach my $i (1 .. @$ref) {
+	$query = "\@attr $i=" . $ref->[$i] . " " . $query
+	    if defined $ref->[$i];
+    }
 
-    my $query = "\@attr 1=$use_attr \@attr 2=3 \@attr 3=3 \@attr 4=2 \@attr 5=100 \@attr 6=1 the";
     $conn->irspy_search_pqf($query, { qindex => $qindex }, {},
 			    ZOOM::Event::ZEND, \&search_complete,
 			    "exception", \&search_complete);