cleanup build and force rebuild of index after creating

Author: adamkorynta

schema/src/buildCWMS_DB.sql

@@ -402,7 +402,13 @@ begin
 end;
 /
 
-@@cwms/oracle_text/setup_indexes.sql
+prompt Rebuilding all disabled function-based indexes...
+begin
+   for rec in (select index_name from all_indexes where owner = '&cwms_schema' and funcidx_status = 'DISABLED') loop
+         execute immediate 'alter index &cwms_schema..'||rec.index_name||' rebuild';
+   end loop;
+end;
+/
 
 ----------------------------------------------------------------------------------------------------------------------------
 -- I hate having this here, but for some reason this SAYS it works when in AT_SCHEMA, but the constraint is missing after --
@@ -416,6 +422,8 @@ exception
 end;
 /
 
+
+@@cwms/oracle_text/setup_indexes.sql
 --
 -- all done
 --

schema/src/cwms/cwms_loc_pkg.sql

@@ -3221,7 +3221,7 @@ AS
     */
    procedure build_search_doc(
       p_rowid in rowid,
-      p_doc   out clob
+      p_doc   out varchar2
    );
 END cwms_loc;
 /

schema/src/cwms/cwms_loc_pkg_body.sql

@@ -11058,36 +11058,36 @@ end unassign_loc_groups;
 
    procedure build_search_doc(
       p_rowid in rowid,
-      p_doc   out clob
+      p_doc   out varchar2
    )
-   is
+      is
    begin
-      select
-         coalesce(b.base_location_id,'') || ' '
-            || coalesce(pl.sub_location_id,'') || ' '
-            || case
-                  when pl.sub_location_id is not null
-                     then b.base_location_id || '-' || pl.sub_location_id || ' '
-                  else ''
-            end
-            || coalesce(pl.public_name,'') || ' '
-            || coalesce(pl.long_name,'') || ' '
-            || coalesce(pl.description,'') || ' '
-            || coalesce(pl.map_label,'') || ' '
-            || coalesce(pl.nearest_city,'') || ' '
-            || coalesce(k.location_kind_id,'') || ' '
-            || coalesce(pl.location_type,'')
+      select max(
+                coalesce(b.base_location_id,'') || ' '
+                   || coalesce(pl.sub_location_id,'') || ' '
+                   || case
+                         when pl.sub_location_id is not null
+                            then b.base_location_id || '-' || pl.sub_location_id || ' '
+                         else ''
+                   end
+                   || coalesce(pl.public_name,'') || ' '
+                   || coalesce(pl.long_name,'') || ' '
+                   || coalesce(pl.description,'') || ' '
+                   || coalesce(pl.map_label,'') || ' '
+                   || coalesce(pl.nearest_city,'') || ' '
+                   || coalesce(k.location_kind_id,'') || ' '
+                   || coalesce(pl.location_type,'')
+             )
       into p_doc
       from at_physical_location pl
-              join at_base_location b
-                   on b.base_location_code = pl.base_location_code
-              join cwms_location_kind k
-                   on k.location_kind_code = pl.location_kind
+              left join at_base_location b
+                        on b.base_location_code = pl.base_location_code
+              left join cwms_location_kind k
+                        on k.location_kind_code = pl.location_kind
       where pl.rowid = p_rowid;
 
-   exception
-      when others then
-         p_doc := null;
+      p_doc := coalesce(p_doc, '');
+
    end build_search_doc;
 
 begin

schema/src/cwms/oracle_text/setup_indexes.sql

@@ -36,11 +36,9 @@ create index at_physical_location_search_idx
        sync (on commit)');
 /
 
-prompt Rebuilding all disabled function-based indexes...
 alter index CWMS_20.AT_PHYSICAL_LOCATION_SEARCH_IDX rebuild;
+
 begin
-   for rec in (select index_name from all_indexes where owner = '&cwms_schema' and funcidx_status = 'DISABLED') loop
-         execute immediate 'alter index &cwms_schema..'||rec.index_name||' rebuild';
-      end loop;
+   ctx_ddl.sync_index('AT_PHYSICAL_LOCATION_SEARCH_IDX');
 end;
-/
+/

schema/src/test/test_cwms_loc.sql

@@ -2774,6 +2774,7 @@ AS
        into l_count
        from av_loc
        where contains(search_doc, 'Van Buren') > 0
+         and unit_system = 'SI'
          and location_id = l_loc_id;
 
        ut.expect(l_count).to_equal(1);
@@ -2810,6 +2811,7 @@ AS
        into l_count
        from av_loc2
        where contains(search_doc, 'VanBuren') > 0
+         and unit_system = 'SI'
          and location_id = l_loc_id;
 
        ut.expect(l_count).to_equal(1);