I've redone all of the kpac category links so they no longer use

a link shortener. I also rearranged some of the links so that there
are more options on the home page.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Conflicts:
	Open-ILS/examples/kpac.xml

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 9186b89..c6e7f71 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -26,41 +26,53 @@
                <!-- Switching to use links instead of searches to see if it caches better -->
                        
                        <!-- ONLY SHOW CURRENT HOLIDAYS -->
-            <!--
-            <cell name="Martin Luther King, Jr." img="cat-mlk.png" type="link">http://bit.ly/1YOlOj0</cell>
-            -->
-                       <cell name="Valentine's Day" img="cat-valentines.png" type="link">http://bit.ly/1IDKRy9</cell> 
-            <cell name="President's Day" img="cat-history-us.png" type="link">http://bit.ly/1JJ6F6t</cell>
-            <!--
-            <cell name="St. Patrick's Day" img="cat-stpatricks.png" type="link">http://bit.ly/1R87r34</cell> 
-            <cell name="Easter" img="cat-easter.png" type="link">http://bit.ly/1Tpti5o</cell>
-            <cell name="4th of July" img="cat-independence.png" type="link">http://bit.ly/1OZGslR</cell> 
-            <cell name="Back to School" img="cat-school.png" type="link">http://bit.ly/1MGU3wl</cell>
-                       <cell name="Halloween" img="cat-halloween.png" type="link">http://bit.ly/1R893tC</cell>
-            <cell name="Thanksgiving" img="cat-thanksgiving.png" type="link">http://bit.ly/1IDOFiK</cell>
-            <cell name="Christmas" img="cat-christmas.png" type="link">http://bit.ly/1YOpmlh</cell>
-            <cell name="Hannukah" img="cat-hannukah.png" type="link">http://bit.ly/1YOqwNB</cell>
-            <cell name="Kwanzaa" img="cat-kwanzaa.png" type="link">http://bit.ly/1ZBJtAg</cell>
-            <cell name="Happy New Year!" img="cat-newyear.png" type="link">http://bit.ly/1JfFfdq</cell> 
-            -->
+<!--
+            <cell name="Martin Luther King, Jr." img="cat-mlk.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%22martin+luther+king%22;sort=pubdate.descending</cell>
+            <cell name="Valentine's Day" img="cat-valentines.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%22valentine%27s+day%22+after%282000%29</cell> 
+                       <cell name="President's Day" img="cat-history-us.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%22presidents%27+day%22;sort=pubdate.descending</cell>
+-->
+                       <cell name="St. Patrick's Day" img="cat-stpatricks.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%22st.+patrick%27s+day%22;sort=pubdate.descending</cell> 
+<!--
+                       <cell name="Easter" img="cat-easter.png" type="link">http://gapines.org/eg/kpac/results?query=su:easter+after%282000%29;sort=pubdate.descending</cell>
+            <cell name="4th of July" img="cat-independence.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28%22independence+day%22+||+keyword:%22fourth+of+july%22%29;sort=pubdate.descending</cell> 
+            <cell name="Back to School" img="cat-school.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28%22back+to+school%22+||+keyword:%22goes+to+school%22%29;sort=pubdate.descending</cell>
+                       <cell name="Halloween" img="cat-halloween.png" type="link">http://gapines.org/eg/kpac/results?query=su:halloween+after%282000%29;qtype=keyword;fi:search_format=book;sort=pubdate.descending</cell>
+            <cell name="Thanksgiving" img="cat-thanksgiving.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=thanksgiving+after%282000%29;sort=pubdate.descending</cell>
+            <cell name="Christmas" img="cat-christmas.png" type="link">http://gapines.org/eg/kpac/results?query=su:christmas+after%282005%29;qtype=keyword</cell>
+            <cell name="Hannukah" img="cat-hannukah.png" type="link">http://gapines.org/eg/kpac/results?qtype=subject;query=hanukkah;sort=pubdate.descending</cell>
+            <cell name="Kwanzaa" img="cat-kwanzaa.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=kwanzaa;sort=pubdate.descending</cell>
+            <cell name="Happy New Year!" img="cat-newyear.png" type="link">http://gapines.org/eg/kpac/results?qtype=title;query=%22new%20year%22;sort=pubdate.descending</cell> 
+-->    
+            <cell name="ABCs" img="cat-abc.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=(alphabet+||+keyword%3Aabc)+after(2000);sort=pubdate.descending</cell>
+            <cell name="Counting" img="cat-123.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28math+||+keyword%3A123%29+after%282005%29;sort=pubdate.descending</cell>
+            <cell name="Colors" img="cat-colors.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=su:color+after%282000%29;fi:audience=a</cell>
+            <cell name="Nutrition" img="cat-nutrition.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28nutrition+||+keyword:%22healthy+food%22%29;sort=pubdate.descending;fi:audience=a,b</cell>
+            <cell name="Shapes" img="cat-shapes.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28%28su:shape+||+su:%22form+perception%22%29+||+su:geometry%29;fi:audience=a;sort=pubdate.descending</cell>
+            <cell name="Telling Time" img="cat-time.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28su:%22clocks+and+watches%22+||+kw:%22telling+time%22%29;fi:audience=a,b;sort=pubdate.descending</cell>
+            <cell name="Seasons" img="cat-seasons.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=su:seasons;fi:audience=a,b</cell>                    
+
+<!--
             <cell type="topic">20</cell>
+-->
             <cell type="topic">30</cell>
             <cell type="topic">40</cell>
-            <cell name="Dinosaurs" img="cat-dinosaur.png" type="link">http://bit.ly/1ktf1Iw</cell>
-            <cell name="Princesses" img="cat-princess.png" type="link">http://bit.ly/1JJbf4z</cell>
+            <cell name="Dinosaurs" img="cat-dinosaur.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=ti:dinosaur+after%282005%29;sort=pubdate.descending</cell>
+            <cell name="Princesses" img="cat-princess.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=ti:princess+after%282005%29;sort=pubdate.descending</cell>
             <cell name="Dewey Categories" img="cat-dewey.png" type="link">homedewey</cell>
         </page>
 
         <!-- topic pages -->
+               <!--
         <page id="20" columns="2" name="Early Learning" img="cat-123.png">
-             <cell name="ABCs" img="cat-abc.png" type="link">http://bit.ly/1QZqUEx</cell>
-             <cell name="Counting" img="cat-123.png" type="link">http://bit.ly/1OxJTpu</cell>
-             <cell name="Colors" img="cat-colors.png" type="link">http://bit.ly/1mpI4Os</cell>
-             <cell name="Nutrition" img="cat-nutrition.png" type="link">http://bit.ly/1RRz9CH</cell>
-             <cell name="Shapes" img="cat-shapes.png" type="link">http://bit.ly/1PxDdVq</cell>
-             <cell name="Telling Time" img="cat-time.png" type="link">http://bit.ly/1mRw1Ki</cell>
-             <cell name="Seasons" img="cat-seasons.png" type="link">http://bit.ly/1OxMKP5</cell>
+             <cell name="ABCs" img="cat-abc.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28alphabet+||+keyword:abc%29+after%282000%29;fi:audience=a;sort=pubdate.descending</cell>
+             <cell name="Counting" img="cat-123.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28numbers+||+keyword:123%29;fi:audience=a</cell>
+             <cell name="Colors" img="cat-colors.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=su:color+after%282000%29;fi:audience=a</cell>
+             <cell name="Nutrition" img="cat-nutrition.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28nutrition+||+keyword:%22healthy+food%22%29;sort=pubdate.descending;fi:audience=a,b</cell>
+             <cell name="Shapes" img="cat-shapes.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28%28su:shape+||+su:%22form+perception%22%29+||+su:geometry%29;fi:audience=a;sort=pubdate.descending</cell>
+             <cell name="Telling Time" img="cat-time.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28su:%22clocks+and+watches%22+||+kw:%22telling+time%22%29;fi:audience=a,b;sort=pubdate.descending</cell>
+             <cell name="Seasons" img="cat-seasons.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=su:seasons;fi:audience=a,b</cell>
                </page>
+               -->
         <page id="30" columns="2" name="Award-Winners" img="cat-caldecott.png" >
              <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>
@@ -73,12 +85,12 @@
              <cell name="For Young Georgians" img="cat-center.png" type="link">https://gapines.org/eg/kpac/results?bookbag=379799;locg=1;trail=11</cell>
         </page>                
         <page id="40" columns="2" name="Transportation" img="cat-truck.png" >
-                       <cell name="Cars &amp; Trucks" img="cat-car.png" type="link">http://bit.ly/1mpCqvR</cell>
-            <cell name="Planes" img="cat-plane.png" type="link">http://bit.ly/1mpCzPP</cell>
-            <cell name="Trains" img="cat-train.png" type="link">http://bit.ly/1OZLjDp</cell>
-            <cell name="Tractors &amp; Machines" img="cat-tractor.png" type="link">http://bit.ly/1Tpx8v8</cell>
-            <cell name="Boats" img="cat-boat.png" type="link">http://bit.ly/1PwYZdD</cell>
-            <cell name="Military" img="cat-military.png" type="link">http://bit.ly/1VpCY11</cell>      
+                       <cell name="Cars &amp; Trucks" img="cat-car.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=su:automobiles+after%282005%29;sort=pubdate.descending</cell>
+            <cell name="Planes" img="cat-plane.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28airplane+||+keyword:aeroplane%29;sort=pubdate.descending</cell>
+            <cell name="Trains" img="cat-train.png" type="link">http://gapines.org/eg/kpac/results?qtype=subject;query=railroad+trains;sort=pubdate.descending</cell>
+            <cell name="Tractors &amp; Machines" img="cat-tractor.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28tractors+||+su:machinery%29;sort=pubdate.descending</cell>
+            <cell name="Boats" img="cat-boat.png" type="link">http://gapines.org/eg/kpac/results?query=su:%22boats+and+boating%22;sort=pubdate.descending</cell>
+            <cell name="Military" img="cat-military.png" type="link">http://gapines.org/eg/kpac/results?qtype=keyword;query=%28su:%22air+pilots,+military%22+||+warships%29;sort=pubdate.descending</cell>     
         </page> 
     </pages>