renameing clashing "search" field to "search_field"

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 8011cc8..84b3db4 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -392,8 +392,8 @@
                        <field name="xpath" oils_obj:array_position="6" oils_persist:virtual="false" />
                        <field name="weight" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="int" />
                        <field name="format" oils_obj:array_position="8" oils_persist:virtual="false" />
-                       <field name="search" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="bool" />
-                       <field name="facet" oils_obj:array_position="10" oils_persist:virtual="false" reporter:datatype="bool" />
+                       <field name="search_field" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="bool" />
+                       <field name="facet_field" oils_obj:array_position="10" oils_persist:virtual="false" reporter:datatype="bool" />
                </fields>
                <links/>
        </class>

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm b/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm
index 1f7a16f..00bf712 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Ingest.pm
@@ -72,7 +72,7 @@ sub post_init {
                                
                                # XXX testing new metabib field use for faceting
                                #->request( 'open-ils.cstore.direct.config.metabib_field.search.atomic', { id => { '!=' => undef } } )
-                               ->request( 'open-ils.cstore.direct.config.metabib_field.search.atomic', { search => 't' } )
+                               ->request( 'open-ils.cstore.direct.config.metabib_field.search.atomic', { search_field => 't' } )
 
                                ->gather(1);
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm
index 76dc35f..a2e1fa5 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm
@@ -31,7 +31,7 @@ package config::metabib_field;
 use base qw/config/;
 __PACKAGE__->table('config_metabib_field');
 __PACKAGE__->columns(Primary => 'id');
-__PACKAGE__->columns(Essential => qw/field_class name xpath weight format search facet/);
+__PACKAGE__->columns(Essential => qw/field_class name xpath weight format search_field facet_field/);
 #-------------------------------------------------------------------------------
 
 package config::identification_type;

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 18ca29b..fc07030 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -114,8 +114,8 @@ CREATE TABLE config.metabib_field (
        xpath           TEXT    NOT NULL,
        weight          INT     NOT NULL DEFAULT 1,
        format          TEXT    NOT NULL DEFAULT 'mods',
-       search          BOOL    NOT NULL DEFAULT TRUE,
-       facet           BOOL    NOT NULL DEFAULT FALSE
+       search_field    BOOL    NOT NULL DEFAULT TRUE,
+       facet_field     BOOL    NOT NULL DEFAULT FALSE
 );
 COMMENT ON TABLE config.metabib_field IS $$
 /*