age protection stuff

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 3ce202b..1199025 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -1474,35 +1474,37 @@
                        <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
                        <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
                        <field name="stat_cat_entries" oils_obj:array_position="3" oils_persist:virtual="true" />
-                       <field name="alert_message" oils_obj:array_position="4" oils_persist:virtual="false" />
-                       <field name="barcode" oils_obj:array_position="5" oils_persist:virtual="false" />
-                       <field name="call_number" oils_obj:array_position="6" oils_persist:virtual="false" />
-                       <field name="circ_as_type" oils_obj:array_position="7" oils_persist:virtual="false" />
-                       <field name="circ_lib" oils_obj:array_position="8" oils_persist:virtual="false" />
-                       <field name="circ_modifier" oils_obj:array_position="9" oils_persist:virtual="false" />
-                       <field name="circulate" oils_obj:array_position="10" oils_persist:virtual="false" />
-                       <field name="copy_number" oils_obj:array_position="11" oils_persist:virtual="false" />
-                       <field name="create_date" oils_obj:array_position="12" oils_persist:virtual="false" />
-                       <field name="creator" oils_obj:array_position="13" oils_persist:virtual="false" />
-                       <field name="deleted" oils_obj:array_position="14" oils_persist:virtual="false" />
-                       <field name="deposit" oils_obj:array_position="15" oils_persist:virtual="false" />
-                       <field name="deposit_amount" oils_obj:array_position="16" oils_persist:virtual="false" />
-                       <field name="dummy_author" oils_obj:array_position="17" oils_persist:virtual="false" />
-                       <field name="dummy_title" oils_obj:array_position="18" oils_persist:virtual="false" />
-                       <field name="edit_date" oils_obj:array_position="19" oils_persist:virtual="false" />
-                       <field name="editor" oils_obj:array_position="20" oils_persist:virtual="false" />
-                       <field name="fine_level" oils_obj:array_position="21" oils_persist:virtual="false" />
-                       <field name="holdable" oils_obj:array_position="22" oils_persist:virtual="false" />
-                       <field name="id" oils_obj:array_position="23" oils_persist:virtual="false" />
-                       <field name="loan_duration" oils_obj:array_position="24" oils_persist:virtual="false" />
-                       <field name="location" oils_obj:array_position="25" oils_persist:virtual="false" />
-                       <field name="opac_visible" oils_obj:array_position="26" oils_persist:virtual="false" />
-                       <field name="price" oils_obj:array_position="27" oils_persist:virtual="false" />
-                       <field name="ref" oils_obj:array_position="28" oils_persist:virtual="false" />
-                       <field name="status" oils_obj:array_position="29" oils_persist:virtual="false" />
-                       <field name="notes" oils_obj:array_position="30" oils_persist:virtual="true" />
-               </fields>
-               <links>
+                       <field name="age_protect" oils_obj:array_position="4" oils_persist:virtual="false" />
+                       <field name="alert_message" oils_obj:array_position="5" oils_persist:virtual="false" />
+                       <field name="barcode" oils_obj:array_position="6" oils_persist:virtual="false" />
+                       <field name="call_number" oils_obj:array_position="7" oils_persist:virtual="false" />
+                       <field name="circ_as_type" oils_obj:array_position="8" oils_persist:virtual="false" />
+                       <field name="circ_lib" oils_obj:array_position="9" oils_persist:virtual="false" />
+                       <field name="circ_modifier" oils_obj:array_position="10" oils_persist:virtual="false" />
+                       <field name="circulate" oils_obj:array_position="11" oils_persist:virtual="false" />
+                       <field name="copy_number" oils_obj:array_position="12" oils_persist:virtual="false" />
+                       <field name="create_date" oils_obj:array_position="13" oils_persist:virtual="false" />
+                       <field name="creator" oils_obj:array_position="14" oils_persist:virtual="false" />
+                       <field name="deleted" oils_obj:array_position="15" oils_persist:virtual="false" />
+                       <field name="deposit" oils_obj:array_position="16" oils_persist:virtual="false" />
+                       <field name="deposit_amount" oils_obj:array_position="17" oils_persist:virtual="false" />
+                       <field name="dummy_author" oils_obj:array_position="18" oils_persist:virtual="false" />
+                       <field name="dummy_title" oils_obj:array_position="19" oils_persist:virtual="false" />
+                       <field name="edit_date" oils_obj:array_position="20" oils_persist:virtual="false" />
+                       <field name="editor" oils_obj:array_position="21" oils_persist:virtual="false" />
+                       <field name="fine_level" oils_obj:array_position="22" oils_persist:virtual="false" />
+                       <field name="holdable" oils_obj:array_position="23" oils_persist:virtual="false" />
+                       <field name="id" oils_obj:array_position="24" oils_persist:virtual="false" />
+                       <field name="loan_duration" oils_obj:array_position="25" oils_persist:virtual="false" />
+                       <field name="location" oils_obj:array_position="26" oils_persist:virtual="false" />
+                       <field name="opac_visible" oils_obj:array_position="27" oils_persist:virtual="false" />
+                       <field name="price" oils_obj:array_position="28" oils_persist:virtual="false" />
+                       <field name="ref" oils_obj:array_position="29" oils_persist:virtual="false" />
+                       <field name="status" oils_obj:array_position="30" oils_persist:virtual="false" />
+                       <field name="notes" oils_obj:array_position="31" oils_persist:virtual="true" />
+               </fields>
+               <links>
+                       <link field="age_protect" reltype="has_a" key="id" map="" class="crahp"/>
                        <link field="call_number" reltype="has_a" key="id" map="" class="acn"/>
                        <link field="location" reltype="has_a" key="id" map="" class="acpl"/>
                        <link field="editor" reltype="has_a" key="id" map="" class="au"/>
@@ -1516,6 +1518,19 @@
                        <link field="circulations" reltype="has_many" key="target_copy" map="" class="circ"/>
                </links>
        </class>
+       <class id="crahp" oils_obj:fieldmapper="config::rules::age_hold_protect" oils_persist:tablename="config.rule_age_hold_protect">
+               <fields oils_persist:primary="id" oils_persist:sequence="config.rule_age_hold_protect_id_seq">
+                       <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
+                       <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
+                       <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
+                       <field name="age" oils_obj:array_position="3" oils_persist:virtual="false" />
+                       <field name="id" oils_obj:array_position="4" oils_persist:virtual="false" />
+                       <field name="name" oils_obj:array_position="5" oils_persist:virtual="false" />
+                       <field name="prox" oils_obj:array_position="6" oils_persist:virtual="false" />
+               </fields>
+               <links>
+               </links>
+       </class>
        <class id="crmf" oils_obj:fieldmapper="config::rules::max_fine" oils_persist:tablename="config.rule_max_fine">
                <fields oils_persist:primary="id" oils_persist:sequence="config.rule_max_fine_id_seq">
                        <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm
index 9d13e2b..ebe5387 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm
@@ -39,7 +39,8 @@ __PACKAGE__->columns( Essential => qw/call_number barcode creator create_date ed
                                   edit_date copy_number status loan_duration circ_lib
                                   fine_level circulate deposit price ref opac_visible
                                   circ_as_type circ_modifier deposit_amount location
-                                  holdable dummy_title dummy_author deleted alert_message/ );
+                                  holdable dummy_title dummy_author deleted alert_message
+                                  age_protect/ );
 
 #-------------------------------------------------------------------------------
 package asset::stat_cat;

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm
index 85e9fd6..2bbe824 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm
@@ -193,6 +193,7 @@ sub _init {
                'Fieldmapper::config::identification_type'      => { hint => 'cit'  },
                'Fieldmapper::config::bib_source'               => { hint => 'cbs'  },
                'Fieldmapper::config::metabib_field'            => { hint => 'cmf'  },
+               'Fieldmapper::config::rules::age_hold_protect'  => { hint => 'crahp'  },
                'Fieldmapper::config::rules::recuring_fine'     => { hint => 'crrf'  },
                'Fieldmapper::config::rules::circ_duration'     => { hint => 'crcd'  },
                'Fieldmapper::config::rules::max_fine'          => { hint => 'crmf'  },