general cleanup; search/facet; library hiding

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

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 54d2d83..76dc35f 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/);
+__PACKAGE__->columns(Essential => qw/field_class name xpath weight format search facet/);
 #-------------------------------------------------------------------------------
 
 package config::identification_type;

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
index 36d60c5..caf1f56 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
@@ -524,9 +524,8 @@ sub patron_search {
        $select = <<"   SQL";
                SELECT  DISTINCT $distinct_list
                  FROM  $u_table AS users
-                       JOIN ($select) AS search
-                 USING (id)
-                 $clone_select
+                       JOIN ($select) AS search USING (id)
+                       $clone_select
                  WHERE users.deleted = FALSE $inactive
                  ORDER BY $order_by
                  LIMIT $limit

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 1df121b..18ca29b 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -110,7 +110,7 @@ INSERT INTO config.xml_transform VALUES ( 'mods', 'http://www.loc.gov/mods/', 'm
 CREATE TABLE config.metabib_field (
        id              SERIAL  PRIMARY KEY,
        field_class     TEXT    NOT NULL CHECK (lower(field_class) IN ('title','author','subject','keyword','series')),
-       name            TEXT    NOT NULL UNIQUE,
+       name            TEXT    NOT NULL,
        xpath           TEXT    NOT NULL,
        weight          INT     NOT NULL DEFAULT 1,
        format          TEXT    NOT NULL DEFAULT 'mods',
@@ -143,6 +143,8 @@ COMMENT ON TABLE config.metabib_field IS $$
  */
 $$;
 
+CREATE UNIQUE INDEX config_metabib_field_class_name_idx ON config.metabib_field (field_class, name);
+
 
 INSERT INTO config.metabib_field ( field_class, name, xpath ) VALUES ( 'series', 'seriestitle', $$//mods:mods/mods:relatedItem[@type="series"]/mods:titleInfo$$ );
 INSERT INTO config.metabib_field ( field_class, name, xpath ) VALUES ( 'title', 'abbreviated', $$//mods:mods/mods:titleInfo[mods:title and (@type='abreviated')]$$ );