adding regex and fts

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1053 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/cdbi.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/cdbi.pm
index 7cc0ba1..4a02242 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/cdbi.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/cdbi.pm
@@ -4,7 +4,7 @@
        use Class::DBI;
        package Class::DBI;
 
-       sub search_fti {
+       sub search_fts {
                my $self = shift;
                my @args = @_;
                if (ref($args[-1]) eq 'HASH') {

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher.pm
index 89bd0a2..c937578 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher.pm
@@ -129,6 +129,7 @@ sub search {
        my $self = shift;
        my $client = shift;
        my $searches = shift;
+       my $options = shift;
 
        my $cdbi = $self->{cdbi};
 
@@ -138,7 +139,9 @@ sub search {
                join(',', map { "$_ => $$searches{$_}" } keys %$searches).
                " } using $search_type",DEBUG);
 
-       for my $obj ($cdbi->$search_type($searches)) {
+       for my $obj ($cdbi->$search_type($searches, $options)) {
+               warn "$obj -> ".ref($obj);
+               next unless ref($obj);
                $client->respond( $obj->to_fieldmapper );
        }
        return undef;