adding links to the stat-cat views

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index efc4fbc..152bb8b 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2453,12 +2453,14 @@
                        <field reporter:label="Patron County" name="patron_county" oils_obj:array_position="24" oils_persist:virtual="false" reporter:datatype="text"/>
                        <field reporter:label="Patron City" name="patron_city" oils_obj:array_position="25" oils_persist:virtual="false" reporter:datatype="text"/>
                        <field reporter:label="Patron ZIP Code" name="patron_zip" oils_obj:array_position="26" oils_persist:virtual="false" reporter:datatype="text"/>
-                       <field reporter:label="Legacy CAT1 Value" name="stat_cat_1" oils_obj:array_position="27" oils_persist:virtual="false" reporter:datatype="int"/>
-                       <field reporter:label="Legacy CAT2 Value" name="stat_cat_2" oils_obj:array_position="28" oils_persist:virtual="false" reporter:datatype="int"/>
+                       <field reporter:label="Legacy CAT1 Link" name="stat_cat_1" oils_obj:array_position="27" oils_persist:virtual="false" reporter:datatype="int"/>
+                       <field reporter:label="Legacy CAT2 Link" name="stat_cat_2" oils_obj:array_position="28" oils_persist:virtual="false" reporter:datatype="int"/>
                        <field reporter:label="Dewey Range -- Tens" name="dewey_range_tens" oils_obj:array_position="29" oils_persist:virtual="false" reporter:datatype="text"/>
                        <field reporter:label="Dewey Range -- Hundreds" name="dewey_range_hundreds" oils_obj:array_position="30" oils_persist:virtual="false" reporter:datatype="text"/>
                        <field reporter:label="Dewey Block -- Tens" name="dewey_block_tens" oils_obj:array_position="31" oils_persist:virtual="false" reporter:datatype="text"/>
                        <field reporter:label="Dewey Block -- Hundreds" name="dewey_block_hundreds" oils_obj:array_position="32" oils_persist:virtual="false" reporter:datatype="text"/>
+                       <field reporter:label="Legacy CAT1 Value" name="stat_cat_1_value" oils_obj:array_position="33" oils_persist:virtual="false" reporter:datatype="int"/>
+                       <field reporter:label="Legacy CAT2 Value" name="stat_cat_2_value" oils_obj:array_position="34" oils_persist:virtual="false" reporter:datatype="int"/>
                </fields>
                <links>
                        <link field="id" reltype="has_a" key="id" map="" class="circ"/>
@@ -2467,8 +2469,8 @@
                        <link field="circ_lib_id" reltype="has_a" key="id" map="" class="aou"/>
                        <link field="call_number" reltype="has_a" key="id" map="" class="acn"/>
                        <link field="patron_home_lib" reltype="has_a" key="id" map="" class="aou"/>
-                       <link field="stat_cat_1" reltype="might_have" key="id" map="" class="rsce1"/>
-                       <link field="stat_cat_2" reltype="might_have" key="id" map="" class="rsce2"/>
+                       <link field="stat_cat_1" reltype="has_a" key="id" map="" class="rsce1"/>
+                       <link field="stat_cat_2" reltype="has_a" key="id" map="" class="rsce2"/>
                </links>
        </class>
 

diff --git a/Open-ILS/src/sql/Pg/example.reporter-extension.sql b/Open-ILS/src/sql/Pg/example.reporter-extension.sql
index 90f8304..6d1e375 100644 (file)
--- a/Open-ILS/src/sql/Pg/example.reporter-extension.sql
+++ b/Open-ILS/src/sql/Pg/example.reporter-extension.sql
@@ -78,7 +78,9 @@ SELECT        cl.shortname AS circ_lib,
        paddr.city AS patron_city,
        paddr.post_code AS patron_zip,
        sc1.stat_cat_entry AS stat_cat_1,
-       sc2.stat_cat_entry AS stat_cat_2
+       sc2.stat_cat_entry AS stat_cat_2,
+       sce1.value AS stat_cat_1_value,
+       sce2.value AS stat_cat_2_value
   FROM action.circulation circ
        JOIN reporter.circ_type circ_type ON (circ.id = circ_type.id)
        JOIN asset.copy cp ON (cp.id = circ.target_copy)
@@ -97,7 +99,9 @@ SELECT        cl.shortname AS circ_lib,
        LEFT JOIN config.item_form_map ifm ON (rd.item_form = ifm.code)
        LEFT JOIN config.item_type_map itm ON (rd.item_type = itm.code)
        LEFT JOIN asset.stat_cat_entry_copy_map sc1 ON (sc1.owning_copy = cp.id AND sc1.stat_cat = 1)
-       LEFT JOIN asset.stat_cat_entry_copy_map sc2 ON (sc2.owning_copy = cp.id AND sc2.stat_cat = 2);
+       LEFT JOIN asset.stat_cat_entry sce1 ON (sce1.id = sc1.stat_cat_entry)
+       LEFT JOIN asset.stat_cat_entry_copy_map sc2 ON (sc2.owning_copy = cp.id AND sc2.stat_cat = 2)
+       LEFT JOIN asset.stat_cat_entry sce2 ON (sce2.id = sc2.stat_cat_entry);
 
 CREATE OR REPLACE VIEW reporter.legacy_cat1 AS
 SELECT id,