ng2-query-ismi: app/query-select.component.ts annotate

annotate app/query-select.component.ts @ 39:7578b21cdf2e

make relation types configurable. relations can have custom labels for incoming or outgoing direction.

author	casties
date	Sun, 14 Feb 2016 19:40:07 +0100
parents	8e03b8fafb87
children	896ae7eefb33

rev	line source
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	1 import {Component, Output, EventEmitter, OnInit} from 'angular2/core';
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	2
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	3 import {QueryMode} from './query-mode';
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	4 import {QueryStep} from './query-step';
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	5 import {QueryState} from './query-state';
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	6
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	7 import {QueryService} from './query.service';
34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	8 import {NormalizationService} from './normalization.service';
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	9 import {getRelationType} from './ismi-relation-types';
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	10
0 39ec75917ef7 first checkin casties parents: diff changeset	11
39ec75917ef7 first checkin casties parents: diff changeset	12 @Component({
39ec75917ef7 first checkin casties parents: diff changeset	13 selector: 'query-select',
39ec75917ef7 first checkin casties parents: diff changeset	14 template: `
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	15 <p *ngIf="resultInfo">   result: {{resultInfo}}</p>
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	16 <div>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	17 <form (ngSubmit)="onSubmit()">
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 1 diff changeset	18 <select (change)="onSelectMode($event)">
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	19 <option></option>
34 e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	20 <option *ngFor="#mode of getQueryModes()" [value]="mode.id">
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	21 {{mode.label}}
0 39ec75917ef7 first checkin casties parents: diff changeset	22 </option>
39ec75917ef7 first checkin casties parents: diff changeset	23 </select>
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	24
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	25 <span *ngIf="selectedMode?.id=='type_is'">
37 8e03b8fafb87 change two-way binding on select because Firefox has problems. casties parents: 34 diff changeset	26 <select *ngIf="queryOptions" [ngModel]="selectedOption" (change)="onSelectOption($event)">
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	27 <option></option>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	28 <option *ngFor="#option of queryOptions" [value]="option">
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	29 {{option}}
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	30 </option>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	31 </select>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	32 </span>
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	33
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	34 <span *ngIf="selectedMode?.id=='relation_is'">
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	35 <select *ngIf="queryOptions" [ngModel]="selectedOption" (change)="onSelectOption($event)">
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	36 <option></option>
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	37 <option *ngFor="#option of queryOptions" [value]="option.getName()">
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	38 {{option.getLabel()}}
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	39 </option>
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	40 </select>
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	41 </span>
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	42
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	43 <span *ngIf="selectedMode?.id=='att_contains' \|\| selectedMode?.id=='att_contains_norm'">
37 8e03b8fafb87 change two-way binding on select because Firefox has problems. casties parents: 34 diff changeset	44 <select [ngModel]="selectedOption" (change)="selectedOption=$event.target.value">
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	45 <option></option>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	46 <option *ngFor="#option of queryOptions" [value]="option">
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	47 {{option}}
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	48 </option>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	49 </select>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	50 <span>contains</span>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	51 <input type="text" [(ngModel)]="queryInput"/>
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	52 </span>
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	53
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	54 <span *ngIf="selectedMode?.id=='att_num_range'">
37 8e03b8fafb87 change two-way binding on select because Firefox has problems. casties parents: 34 diff changeset	55 <select [ngModel]="selectedOption" (change)="selectedOption=$event.target.value">
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	56 <option></option>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	57 <option *ngFor="#option of queryOptions" [value]="option">
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	58 {{option}}
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	59 </option>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	60 </select>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	61 <span>is between</span>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	62 <input type="text" [(ngModel)]="queryInput"/>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	63 <span>and</span>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	64 <input type="text" [(ngModel)]="queryInput2"/>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	65 </span>
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	66
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	67 <span *ngIf="selectedMode?.id=='id_is'">
4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	68 <input type="text" [(ngModel)]="queryInput"/>
4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	69 </span>
4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	70
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	71 <button type="submit">Submit</button>
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	72 </form>
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	73 </div>
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	74 `,
34 e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	75 inputs: ['queryStep', 'index'],
e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	76 outputs: ['queryChanged']
0 39ec75917ef7 first checkin casties parents: diff changeset	77 })
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	78
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	79 export class QuerySelectComponent implements OnInit {
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	80 public queryStep: string;
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	81 public index: number;
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	82 public resultInfo: string;
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	83 public queryModes: QueryMode[];
fa646ee46c19 more query generation. casties parents: 7 diff changeset	84 public selectedMode: QueryMode;
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	85 public queryOptions: string[];
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	86 public selectedOption: string;
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	87 public queryInput: string;
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	88 public queryInput2: string;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	89
34 e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	90 // output queryChanged
e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	91 public queryChanged: EventEmitter<QueryState> = new EventEmitter<QueryState>();
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	92
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	93 constructor(private _queryService: QueryService, private _normService: NormalizationService) {}
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	94
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	95 ngOnInit() {
4 351c3df28602 work on result component. casties parents: 3 diff changeset	96 this.setup();
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	97 }
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	98
4 351c3df28602 work on result component. casties parents: 3 diff changeset	99 setup() {
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	100 console.log("query-select setup step=", this.queryStep);
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	101 var step = this._queryService.state.steps[this.index-1];
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	102 if (step != null) {
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	103 this.resultInfo = step.resultInfo;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	104 }
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	105 }
0 39ec75917ef7 first checkin casties parents: diff changeset	106
34 e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	107 getQueryModes(): QueryMode[] {
e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	108 this.queryModes = this._queryService.getQueryModes(this.index);
e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	109 return this.queryModes;
e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	110 }
e19d4c5e10a1 restricted selectable options for first query step. casties parents: 32 diff changeset	111
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 1 diff changeset	112 onSelectMode(event: any) {
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 0 diff changeset	113 var selected = event.target.value;
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	114 this.selectedMode = this.queryModes.find(mode => mode.id === selected);
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	115 this.queryOptions = this._queryService.getQueryOptions(this.selectedMode);
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	116 }
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	117
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	118 onSelectOption(event: any) {
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	119 var selected = event.target.value;
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 4 diff changeset	120 console.debug("selected option:", selected);
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	121 this.selectedOption = selected;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	122 this.onSubmit();
0 39ec75917ef7 first checkin casties parents: diff changeset	123 }
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	124
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	125 onSubmit() {
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	126 console.debug("Submit! selectedMode=", this.selectedMode, " selectedOption=", this.selectedOption, " queryInput=", this.queryInput);
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	127 var step: QueryStep;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	128 if (this.selectedMode.id == 'type_is') {
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	129 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	130 * type_is
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	131 */
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	132 let opt = this.selectedOption;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	133 if (opt) {
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	134 step = new QueryStep(this.selectedMode, {'objectType': opt});
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	135 }
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	136 } else if (this.selectedMode.id == 'relation_is') {
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	137 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	138 * relation_is
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	139 */
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	140 let opt = this.selectedOption;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	141 if (opt) {
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	142 let rel = getRelationType(opt);
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	143 step = new QueryStep(this.selectedMode, {'relationType': rel});
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	144 }
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	145 } else if (this.selectedMode.id == 'id_is') {
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	146 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	147 * id is
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	148 */
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	149 let val = this.queryInput;
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	150 if (val) {
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	151 step = new QueryStep(this.selectedMode, {'value': val});
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	152 }
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	153 } else if (this.selectedMode.id == 'att_contains') {
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	154 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	155 * att_contains
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	156 */
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	157 let att = this.selectedOption;
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	158 let val = this.queryInput;
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	159 if (att && val) {
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	160 step = new QueryStep(this.selectedMode, {'attribute': att, 'value': val});
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	161 }
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	162 } else if (this.selectedMode.id == 'att_num_range') {
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	163 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	164 * att_num_range
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	165 */
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	166 let att = this.selectedOption;
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	167 let nlo = this.queryInput;
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	168 let nhi = this.queryInput2;
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	169 if (att && nlo && nhi) {
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	170 step = new QueryStep(this.selectedMode, {'attribute': att, 'numLo': nlo, 'numHi': nhi});
32 4c046f3244ec new 'id_is' query type. new '_type' attribute. casties parents: 20 diff changeset	171 }
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	172 } else if (this.selectedMode.id == 'att_contains_norm') {
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	173 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	174 * att_contains_norm
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	175 *
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	176 * calls normalization service and submits event in callback
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	177 */
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	178 let att = this.selectedOption;
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	179 let val = this.queryInput;
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	180 if (att && val) {
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	181 // run search term through normalizer
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	182 this._normService.fetchArabicTranslitNormalizedString(val)
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	183 .subscribe(
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	184 data => {
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	185 console.debug("openmind norm data=", data);
20 34cd764e234b make interfaces into classes. factor out NormalizationService. casties parents: 15 diff changeset	186 step = new QueryStep(this.selectedMode, {'attribute': att, 'value': val, 'normValue': data.normalized_text});
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	187 this._queryService.setQueryStep(this.index, step);
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	188 // query has changed now
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	189 this.queryChanged.emit(this._queryService.getState());
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	190 },
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	191 err => console.error("openmind norm error=", err),
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	192 () => console.debug("openmind norm query Complete")
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	193 );
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	194 // query has not been set yet
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	195 return;
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 11 diff changeset	196 }
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	197 }
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	198
39 7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	199 /*
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	200 * set step and submit change event
7578b21cdf2e make relation types configurable. casties parents: 37 diff changeset	201 */
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	202 if (step != null) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	203 this._queryService.setQueryStep(this.index, step);
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	204 this.queryChanged.emit(this._queryService.getState());
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	205 }
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 8 diff changeset	206 }
0 39ec75917ef7 first checkin casties parents: diff changeset	207 }

Mercurial > hg > ng2-query-ismi

annotate app/query-select.component.ts @ 39:7578b21cdf2e