Corrected version of kpac.xml with properly nested preset searches

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 23d30e6..f2e96f6 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -14,6 +14,8 @@
              For multiple words:  keyword:dog beagle
              For phrase:          keyword:"fourth of july"
              For boolean 'or':    (keyword:dog || keyword:puppy)
+             For multiples, next the terms:
+                                  ((keyword:dog || keyword:puppy) || keyword:beagle)
              For 'link':          http://www.evergreen.org
         -->
 
@@ -51,33 +53,33 @@
         <!-- use type="simplesearch" for searches, type="link" for web page links -->
 
         <page id="10" columns="2" name="Transportation" img="cat-truck.png" >
-            <cell name="Cars &amp; Trucks" img="cat-car.png" type="simplesearch">(keyword:car || keyword:truck || keyword: automobile)</cell>
-            <cell name="Planes" img="cat-plane.png" type="simplesearch">keyword:airplane</cell>
+            <cell name="Cars &amp; Trucks" img="cat-car.png" type="simplesearch">((keyword:car || keyword:truck) || keyword: automobile)</cell>
+            <cell name="Planes" img="cat-plane.png" type="simplesearch">(keyword:airplane || keyword:aeroplane)</cell>
             <cell name="Trains" img="cat-train.png" type="simplesearch">(keyword:train || keyword:locomotive)</cell>
             <cell name="Tractors &amp; Construction" img="cat-tractor.png" type="simplesearch">(keyword:tractor || keyword:construction)</cell>
             <cell name="Boats" img="cat-boat.png" type="simplesearch">(keyword:boat || keyword:ship)</cell>
-            <cell name="Military" img="cat-military.png" type="simplesearch">(keyword:tank || keyword:submarine || keyword:aircraft carrier)</cell>
+            <cell name="Military" img="cat-military.png" type="simplesearch">(((keyword:military tank || keyword:submarine) || keyword:aircraft carrier) || keyword:military aircraft)</cell>
         </page> 
 
         <page id="11" columns="2" name="Award-Winners" img="cat-caldecott.png" >
-             <cell name="Caldecott Medal" img="cat-caldecott.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153202;locg=1;trail=11</cell>
-             <cell name="Coretta Scott King" img="cat-king.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153204;locg=1;trail=11</cell>
-             <cell name="Geisel Award" img="cat-geisel.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153203;locg=1;trail=11</cell>
-             <cell name="Newbery Medal" img="cat-newbery.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153201;locg=1;trail=11</cell>
-             <cell name="Book Award Winners" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153206;locg=1;trail=11</cell>
-             <cell name="Book Award Nominees" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=154170;locg=1;trail=11</cell>
-             <cell name="Picture Book Winners" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153205;locg=1;trail=11</cell>
-             <cell name="Picture Book Nominees" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=154171;locg=1;trail=11</cell>
+             <cell name="Caldecott Medal" img="cat-caldecott.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153202;locg=1;trail=11</cell>
+             <cell name="Coretta Scott King" img="cat-king.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153204;locg=1;trail=11</cell>
+             <cell name="Geisel Award" img="cat-geisel.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153203;locg=1;trail=11</cell>
+             <cell name="Newbery Medal" img="cat-newbery.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153201;locg=1;trail=11</cell>
+             <cell name="Book Award Winners" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153206;locg=1;trail=11</cell>
+             <cell name="Book Award Nominees" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=154170;locg=1;trail=11</cell>
+             <cell name="Picture Book Winners" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153205;locg=1;trail=11</cell>
+             <cell name="Picture Book Nominees" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=154171;locg=1;trail=11</cell>
 
         </page>
 
         <page id="12" columns="2" name="Early Learning" img="cat-123.png">
              <cell name="ABCs" img="cat-abc.png" type="simplesearch">(keyword:abc || keyword:alphabet)</cell>
-             <cell name="Counting" img="cat-123.png" type="simplesearch">(keyword:number || keyword:123 || keyword:counting)</cell>
+             <cell name="Counting" img="cat-123.png" type="simplesearch">((keyword:number || keyword:123) || keyword:counting)</cell>
              <cell name="Colors" img="cat-colors.png" type="simplesearch">keyword:colors</cell>
-             <cell name="Shapes" img="cat-shapes.png" type="simplesearch">(keyword:shapes || keyword:circle || keyword:square || keyword:triangle)</cell>
-             <cell name="Telling Time" img="cat-time.png" type="simplesearch">keyword:telling time</cell>
-             <cell name="Seasons" img="cat-seasons.png" type="simplesearch">(keyword:seasons || keyword:winter || keyword:spring || keyword:summer || keyword:fall)</cell>
+             <cell name="Shapes" img="cat-shapes.png" type="simplesearch">(((keyword:shapes || keyword:circle) || keyword:square) || keyword:triangle)</cell>
+             <cell name="Telling Time" img="cat-time.png" type="simplesearch">(keyword:telling time || keyword:clock)</cell>
+             <cell name="Seasons" img="cat-seasons.png" type="simplesearch">((((keyword:seasons || keyword:spring) || keyword:summer) || keyword:fall) || keyword:winter)</cell>
         </page>
     </pages>