Fix book service compile bug

ceskaexpedice · Mar 9, 2018 · a80aa69 · a80aa69
1 parent 2b0b254
commit a80aa69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/app/services/book.service.ts b/src/app/services/book.service.ts
@@ -20,6 +20,8 @@ import { Location } from '@angular/common';
 import { MzModalService } from 'ng2-materialize';
 import { DialogOcrComponent } from '../dialog/dialog-ocr/dialog-ocr.component';
 import { request } from 'https';
+import 'rxjs/add/observable/forkJoin';
+
 
 
 @Injectable()
@@ -100,7 +102,7 @@ export class BookService {
 
 
     private loadIssues(periodicalUuid: string, volumeUuid: string, issueUuid: string) {
-        this.krameriusApiService.getPeriodicalIssues(periodicalUuid, volumeUuid).subscribe(response => {
+        this.krameriusApiService.getPeriodicalIssues(periodicalUuid, volumeUuid, null).subscribe(response => {
             const issues = this.solrService.periodicalItems(response, 'periodicalitem');
             if (!issues || issues.length < 1) {
                 return;
@@ -126,7 +128,7 @@ export class BookService {
     }
 
     private loadMonographUnits(monographUuid: string, unitUud: string) {
-        this.krameriusApiService.getMonographUnits(monographUuid).subscribe(response => {
+        this.krameriusApiService.getMonographUnits(monographUuid, null).subscribe(response => {
             const units = this.solrService.periodicalItems(response, 'monographunit');
             if (!units || units.length < 1) {
                 return;

diff --git a/src/app/services/kramerius-api.service.ts b/src/app/services/kramerius-api.service.ts
@@ -159,10 +159,10 @@ export class KrameriusApiService {
         const modelRestriction = models.map(a => 'fedora.model:' + a).join(' OR ');
         let url = this.API_URL + '/search?fl=PID,dostupnost,fedora.model,dc.title,datum_str,details&q=pid_path:'
                 + pidPath + '/* AND level:' + level + ' AND (' + modelRestriction + ')';
-        if (query.accessibility === 'private' || query.accessibility === 'public') {
+        if (query && (query.accessibility === 'private' || query.accessibility === 'public')) {
             url += ' AND dostupnost:' + query.accessibility;
         }
-        if (applyYear && query.isYearRangeSet()) {
+        if (query && applyYear && query.isYearRangeSet()) {
             url += ' AND (rok:[' + query.from + ' TO ' + query.to + '] OR (datum_begin:[* TO ' + query.to + '] AND datum_end:[' + query.from + ' TO *]))';
         }
         url += '&sort=datum asc,datum_str asc,fedora.model asc&rows=1500&start=0';