Tweaked searches - ready to push to the public KPAC now (along with the graphics...

Conflicts:

	Open-ILS/examples/kpac.xml

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index d2f89d6..c6e6ef4 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -80,9 +80,24 @@
              <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="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="Nutrition" img="cat-nutrition.png" type="simplesearch">((keyword:nutrition || keyword:vitamins) || keyword:healthy food)</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>
+
+        <page id="20" columns="2" name="Fizz! Boom! Read!" img="2014srp-main.jpg"> 
+             <cell name="Science Experiments" img="2014srp-experiment.jpg" type="simplesearch">keyword:science experiment</cell>
+             <cell name="Backyard Bugs" img="2014srp-bugs.jpg" type="simplesearch">(keyword:bug || keyword:insect)</cell>
+             <cell name="Dinosaurs" img="2014srp-dino.jpg" type="simplesearch">keyword:dinosaur sort(pubdate)%23descending</cell>
+             <cell name="Computer Science" img="2014srp-computers.jpg" type="simplesearch">keyword:computer sort(pubdate)%23descending</cell>
+             <cell name="Lizards &amp; Frogs" img="2014srp-snakes.jpg" type="simplesearch">(((keyword:snake || keyword:lizard) || keyword:reptile) || keyword:amphibian)</cell>
+             <cell name="Biology" img="2014srp-biology.jpg" type="simplesearch">(keyword:biology || keyword:living things)</cell>
+             <cell name="Volcanoes" img="2014srp-volcano.jpg" type="simplesearch">keyword:volcano</cell>
+             <cell name="Space &amp; Planets" img="2014srp-space.jpg" type="simplesearch">((keyword:astronomy || keyword:planet) || keyword:space)</cell>
+             <cell name="Motion &amp; Energy" img="2014srp-motion.jpg" type="simplesearch">((keyword:motion || keyword:physics) || keyword:energy)</cell>
+             <cell name="Ocean Life" img="2014srp-ocean.jpg" type="simplesearch">((((keyword:ocean || keyword:octopus) || keyword:beach) || keyword:whale) || keyword:shark)</cell>
+             <cell name="Weather" img="2014srp-weather.jpg" type="simplesearch">(keyword:weather || keyword:meteorology)</cell>
         </page>
     </pages>