[open-ils-commits] r16188 - in trunk: . Open-ILS/src/perlmods/OpenILS/Application/Storage (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-04-08 22:16:56 -0400 (Thu, 08 Apr 2010)
New Revision: 16188

Modified:
   trunk/
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/QueryParser.pm
Log:
throw away single ampersand and pipe


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-04-08 11:41:46.591000080 -0400
committer: Mike Rylander <miker at esilibrary.com>
properties: 
	branch-nick: trunk

   + timestamp: 2010-04-08 22:16:18.703999996 -0400
committer: Mike Rylander <miker at miker-msi>
properties: 
	branch-nick: head-ILS

Name: bzr:file-ids
   - Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm	129 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fsrc%2Fperlmods%2FOpenILS%2FApplication%2FStorage%2FCDBI%2Factor.pm

   + Open-ILS/src/perlmods/OpenILS/Application/Storage/QueryParser.pm	15833 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk%2FOpen-ILS%2Fsrc%2Fperlmods%2FOpenILS%2FApplication%2FStorage%2FQueryParser.pm

Name: bzr:revision-id:v4
   - 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
12231 jason at esilibrary.com-20091209221438-vv4crqppm8ajj3dr
12804 jason at esilibrary.com-20100324194046-jza2ic2dlpq8txhc
12946 miker at esilibrary.com-20100402183612-8xznj35wfohk7zyu
12955 miker at esilibrary.com-20100403141037-h8d57ryrmkkg9yhb
12971 miker at whirly-20100405202254-aztbsf3p3eey9e8e
12997 miker at esilibrary.com-20100408154146-zodwuxxizwf0y449

   + 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
12231 jason at esilibrary.com-20091209221438-vv4crqppm8ajj3dr
12804 jason at esilibrary.com-20100324194046-jza2ic2dlpq8txhc
12946 miker at esilibrary.com-20100402183612-8xznj35wfohk7zyu
12955 miker at esilibrary.com-20100403141037-h8d57ryrmkkg9yhb
12971 miker at whirly-20100405202254-aztbsf3p3eey9e8e
12997 miker at esilibrary.com-20100408154146-zodwuxxizwf0y449
13010 miker at miker-msi-20100409021618-5f0ohbg5cgi5pai0

Name: bzr:text-parents
   - Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/actor.pm	svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:13558

   + Open-ILS/src/perlmods/OpenILS/Application/Storage/QueryParser.pm	svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:16024


Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/QueryParser.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/QueryParser.pm	2010-04-09 02:08:47 UTC (rev 16187)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/QueryParser.pm	2010-04-09 02:16:56 UTC (rev 16188)
@@ -622,15 +622,17 @@
             my $atom = $1;
             my $after = $';
 
-            my $class_node = $struct->classed_node($current_class);
+            $_ = $after;
+            $last_type = '';
+
             my $negator = ($atom =~ s/^-//o) ? '!' : '';
             my $truncate = ($atom =~ s/\*$//o) ? '*' : '';
 
-            $class_node->add_fts_atom( $atom, suffix => $truncate, prefix => $negator, node => $class_node );
-            $struct->joiner( '&' );
-
-            $_ = $after;
-            $last_type = '';
+            if (!grep { $atom eq $_ } ('&','|')) { # throw away & and |, not allowed in tsquery, and not really useful anyway
+                my $class_node = $struct->classed_node($current_class);
+                $class_node->add_fts_atom( $atom, suffix => $truncate, prefix => $negator, node => $class_node );
+                $struct->joiner( '&' );
+            }
         } 
 
         last unless ($_);