From 5adfb3c80d7cee415e33a09db358030ce24d7686 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 20 May 2020 11:04:17 -0400
Subject: [PATCH] LP1879335 Manage Authorities Angular WIP

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../src/app/staff/cat/authority/browse.component.html  |  6 +++---
 .../src/app/staff/cat/authority/browse.component.ts    |  6 ++++--
 .../lib/OpenILS/Application/Search/Authority.pm        | 18 +++++++++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
index 7846e8dd64..94a0f5388c 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
@@ -13,8 +13,8 @@
       </div>
       <input type="text" class="form-control" placeholder="Search Term" 
         i18n-placeholder aria-describedby="search-term" 
-        (change)="search()"
-        (keyup.enter)="search()" [(ngModel)]="browse.searchTerm">
+        (change)="search(null, true)"
+        (keyup.enter)="search(null, true)" [(ngModel)]="browse.searchTerm">
     </div>
   </div>
   <div class="col-lg-5">
@@ -23,7 +23,7 @@
         <span class="input-group-text" id="auth-axis" i18n>Authority Type</span>
       </div>
       <eg-combobox #axisCbox [(ngModel)]="authorityAxis" 
-        [entries]="browse.authorityAxes" (onChange)="search(0, $event)">
+        [entries]="browse.authorityAxes" (onChange)="search(null, true)">
       </eg-combobox>
       <!--
       Hiding 'submit' button since it should never be necessary, plus it
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts
index bfcdbfbcfd..8f6dc1e22f 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.ts
@@ -38,7 +38,7 @@ export class BrowseAuthorityComponent implements OnInit {
         private net: NetService,
         private org: OrgService,
         private pcrud: PcrudService,
-        private browse: BrowseService
+        public browse: BrowseService
     ) {}
 
     ngOnInit() {
@@ -97,9 +97,11 @@ export class BrowseAuthorityComponent implements OnInit {
         this.browse.markedForMerge = {};
     }
 
-    search(offset?: number) {
+    search(offset?: number, isNew?: boolean) {
         if (offset) {
             this.browse.searchOffset += offset;
+        } else if (isNew) {
+            this.browse.searchOffset = 0;
         }
         this.grid.reload();
     }
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Authority.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Authority.pm
index 549593a2ac..9e2dfda25d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Authority.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Authority.pm
@@ -392,10 +392,11 @@ sub authority_main_entry {
         };
 
         # Extract the heading and thesaurus.
-        # In theory this data has already been extracted in the DB,
-        # but my results vary quite a bit from the previous authority
-        # manage interface.  I took the MARC parsing approach because
-        # it matches the logic (and results) of the previous UI.
+        # In theory this data has already been extracted in the DB, but
+        # using authority.simple_heading results in data that varies
+        # quite a bit from the previous authority manage interface.  I
+        # took the MARC parsing approach because it matches the logic
+        # (and results) of the previous UI.
 
         my $marc = MARC::Record->new_from_xml($rec->marc);
         my $heading_field = $marc->field('1..');
@@ -403,16 +404,19 @@ sub authority_main_entry {
 
         my $field_008 = $marc->field('008');
         if ($field_008) {
+
+            # Extract the 1-char thesaurus code from the 008.
             my $thes = substr($field_008->data, 11, 1);
 
             if (defined $thes) {
                 $response->{thesaurus} = $thes;
 
                 if ($thes ne 'z') { # 'z' ('Other') maps to many entries
-                    my $thesaurus = 
-                        $e->search_authority_thesaurus({short_code => $thes})->[0];
+                    my $thesaurus = $e->search_authority_thesaurus(
+                        {short_code => $thes})->[0];
 
-                    $response->{thesaurus_code} = $thesaurus->code if $thesaurus;
+                    $response->{thesaurus_code} = 
+                        $thesaurus->code if $thesaurus;
                 }
             }
         }
-- 
2.11.0