ng2-query-ismi: app/query.service.ts annotate

annotate app/query.service.ts @ 13:98b435bb6c0c

more query work.

author	Robert Casties <casties@mpiwg-berlin.mpg.de>
date	Thu, 21 Jan 2016 14:47:00 +0100
parents	1843b12eff9a
children	7dc7ea95ca26

rev	line source
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	1 import {Injectable} from 'angular2/core';
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	2 import {Http, Headers} from 'angular2/http';
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	3
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	4 import 'rxjs/Rx'; // import all RxJS operators
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	5
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	6 import {QueryMode, QUERY_MODES} from './query-mode';
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	7 import {QueryState} from './query-state';
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	8 import {QueryStep} from './query-step';
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	9
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	10 @Injectable()
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	11 export class QueryService {
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	12
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	13 public neo4jBaseUrl = 'https://ismi-dev.mpiwg-berlin.mpg.de/neo4j-ismi/db/data';
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	14 //public neo4jBaseUrl = 'http://localhost:7474/db/data';
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	15 public openMindBaseUrl = 'https://ismi-dev.mpiwg-berlin.mpg.de/om4-ismi/';
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	16 //public openMindBaseUrl = 'http://localhost:18080/ismi-richfaces/':
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	17 public state: QueryState;
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	18 public ismiObjectTypes: any;
2 80270f5a5735 more tinkering. casties parents: 1 diff changeset	19
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	20 constructor(private _http: Http) {
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	21 this.state = {
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	22 'steps': [],
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	23 'resultCypherQuery': '',
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	24 'cypherQueryParams': {},
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	25 'attributesCypherQuery': '',
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	26 'relationsCypherQuery': '',
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	27 'results': [],
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	28 'resultTypes': '',
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	29 'numResults': 0,
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	30 'resultInfo': ''
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	31 };
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	32 }
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	33
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	34 setup() {
fa646ee46c19 more query generation. casties parents: 7 diff changeset	35 this.setupIsmiObjectTypes();
fa646ee46c19 more query generation. casties parents: 7 diff changeset	36 }
fa646ee46c19 more query generation. casties parents: 7 diff changeset	37
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	38 getState() {
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	39 return this.state;
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	40 }
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	41
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	42 getQueryModes(): QueryMode[] {
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	43 return QUERY_MODES;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	44 }
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	45
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	46 getQueryOptions(queryMode: QueryMode) {
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	47 var options = ['a1', 'b1', 'c1'];
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	48 if (queryMode.id === 'type_is') {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	49 options = this.ismiObjectTypes;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	50 } else if (queryMode.id === 'relation_is') {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	51 options = this.state.nextQueryRelations;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	52 } else if (queryMode.id === 'att_contains') {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	53 options = this.state.nextQueryAttributes;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	54 } else if (queryMode.id === 'att_contains_norm') {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	55 options = this.state.nextQueryAttributes;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	56 }
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	57 console.debug("getQueryOptions returns: ", options);
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	58 return options;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	59 }
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	60
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	61 setupIsmiObjectTypes() {
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	62 var query = `MATCH (n) WITH DISTINCT labels(n) AS labels
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	63 UNWIND labels AS label
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	64 RETURN DISTINCT label ORDER BY label`;
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	65
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	66 var res = this.fetchCypherResult(query);
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	67 res.subscribe(
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	68 data => {
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	69 console.debug("neo4j data=", data);
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	70 this.ismiObjectTypes = data.results[0].data.map(elem => elem.row[0]).filter(elem => elem[0] != "_");
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	71 console.debug("ismi types=", this.ismiObjectTypes);
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	72 },
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	73 err => console.error("neo4j error=", err),
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	74 () => console.debug('neo4j query Complete')
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	75 );
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	76 }
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	77
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	78 setQueryStep(index: number, step: QueryStep) {
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	79 this.state.steps[index] = step;
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	80 this.createCypherQuery();
9f5473536a98 more query generation. casties parents: 5 diff changeset	81 }
9f5473536a98 more query generation. casties parents: 5 diff changeset	82
9f5473536a98 more query generation. casties parents: 5 diff changeset	83 createCypherQuery() {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	84 var queryMatch = '';
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	85 var queryWhere = '';
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	86 var queryReturn = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	87 var queryParams = {};
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	88 var resultQuery = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	89 var attributesQuery = '';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	90 var relationsQuery = '';
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	91 var returnType = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	92 var nIdx = 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	93 this.state.steps.forEach((step, stepIdx) => {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	94 // object type is
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	95 if (step.mode.id === 'type_is') {
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	96 queryMatch = `MATCH (n${nIdx}:${step.objectType})`;
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	97 queryWhere = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	98 queryReturn = `RETURN n${nIdx}`;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	99 returnType = 'node';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	100 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	101
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	102 // relation type is
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	103 if (step.mode.id === 'relation_is') {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	104 nIdx += 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	105 queryMatch += `-[:\`${step.relationType}\`]->(n${nIdx})`;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	106 queryReturn = `RETURN n${nIdx}`;
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	107 returnType = 'node';
fa646ee46c19 more query generation. casties parents: 7 diff changeset	108 }
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	109
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	110 // attribute contains
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	111 if (step.mode.id === 'att_contains') {
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	112 if (!queryWhere) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	113 queryWhere = 'WHERE ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	114 } else {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	115 queryWhere += ' AND ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	116 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	117 queryWhere += `lower(n${nIdx}.${step.attribute}) CONTAINS lower({att_val${stepIdx}})`;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	118 queryParams[`att_val${stepIdx}`] = step.value;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	119 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	120
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	121 // attribute contains (normalized)
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	122 if (step.mode.id === 'att_contains_norm') {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	123 if (!queryWhere) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	124 queryWhere = 'WHERE ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	125 } else {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	126 queryWhere += ' AND ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	127 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	128 queryWhere += `lower(n${nIdx}._n_${step.attribute}) CONTAINS lower('${step.value}')`;
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	129 }
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	130
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	131 });
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	132 resultQuery = queryMatch + '\n' + queryWhere + '\n' + queryReturn;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	133 attributesQuery = queryMatch + ' ' + queryWhere + ` WITH DISTINCT keys(n${nIdx}) AS atts UNWIND atts AS att RETURN DISTINCT att ORDER BY att`;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	134 relationsQuery = queryMatch + '-[r]-() ' + queryWhere + ' RETURN DISTINCT type(r)';
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	135 this.state.resultCypherQuery = resultQuery;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	136 this.state.cypherQueryParams = queryParams;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	137 this.state.attributesCypherQuery = attributesQuery;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	138 this.state.relationsCypherQuery = relationsQuery;
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	139 this.state.resultTypes = returnType;
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	140 }
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	141
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	142 updateQuery() {
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	143 this.createCypherQuery();
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	144 this.state.resultInfo = 'loading...';
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	145 // run query for result table
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	146 var resQuery = this.state.resultCypherQuery;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	147 var queryParams = this.state.cypherQueryParams;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	148 var resRes = this.fetchCypherResult(resQuery, queryParams);
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	149 resRes.subscribe(
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	150 data => {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	151 console.debug("neo4j result data=", data);
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	152 this.state.results = data.results[0].data.map(elem => elem.row[0]);
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	153 this.state.numResults = this.state.results.length;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	154 // count all types
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	155 var resTypes = {};
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	156 this.state.results.forEach((r) => {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	157 if (resTypes[r.type] == null) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	158 resTypes[r.type] = 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	159 } else {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	160 resTypes[r.type] += 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	161 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	162 });
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	163 var info = '';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	164 for (var t in resTypes) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	165 info += t + '(' + resTypes[t] + ') ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	166 }
12 1843b12eff9a cleaning output. casties parents: 11 diff changeset	167 this.state.resultInfo = info.substr(0, info.length-1);
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	168 },
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	169 err => console.error("neo4j result error=", err),
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	170 () => console.debug('neo4j result query Complete')
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	171 );
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	172 // run query for attribute list
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	173 if (this.state.attributesCypherQuery) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	174 var attRes = this.fetchCypherResult(this.state.attributesCypherQuery, queryParams);
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	175 attRes.subscribe(
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	176 data => {
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	177 console.debug("neo4j att data=", data);
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	178 this.state.nextQueryAttributes = data.results[0].data.map(elem => elem.row[0]).filter(elem => elem[0] != "_");;
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	179 },
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	180 err => console.error("neo4j att error=", err),
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	181 () => console.debug('neo4j att query Complete')
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	182 );
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	183 }
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	184 // run query for relations list
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	185 if (this.state.relationsCypherQuery) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	186 var attRes = this.fetchCypherResult(this.state.relationsCypherQuery, queryParams);
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	187 attRes.subscribe(
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	188 data => {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	189 console.debug("neo4j rel data=", data);
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	190 this.state.nextQueryRelations = data.results[0].data.map(elem => elem.row[0]).filter(elem => elem[0] != "_");;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	191 },
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	192 err => console.error("neo4j rel error=", err),
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	193 () => console.debug('neo4j rel query Complete')
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	194 );
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	195 }
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	196 }
9f5473536a98 more query generation. casties parents: 5 diff changeset	197
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	198 fetchCypherResult(query: string, params = {}) {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	199 console.debug("fetching cypher query: ", query);
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	200 var headers = new Headers();
2 80270f5a5735 more tinkering. casties parents: 1 diff changeset	201 headers.append('Authorization', 'Basic ' + btoa('neo4j' + ':' + 'neo5j'));
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	202 headers.append('Content-Type', 'application/json');
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	203 headers.append('Accept', 'application/json');
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	204 // put headers in options
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	205 var opts = {'headers': headers};
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	206 // create POST data from query
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	207 var data = JSON.stringify({'statements': [
402c7229dc7c more query generation. casties parents: 8 diff changeset	208 {'statement': query, 'parameters': params}
402c7229dc7c more query generation. casties parents: 8 diff changeset	209 ]});
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	210 // make post request asynchronously
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	211 var resp = this._http.post(this.neo4jBaseUrl+'/transaction/commit', data, opts)
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	212 // filter result as JSON
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	213 .map(res => res.json());
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	214 // return Observable
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	215 return resp;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	216 }
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	217
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	218 fetchNormalizedString(text: string) {
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	219 console.debug("fetching normalized string: ", text);
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	220 var headers = new Headers();
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	221 headers.append('Accept', 'application/json');
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	222 // put headers in options
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	223 var opts = {'headers': headers};
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	224 // make get request asynchronously
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	225 var url = this.openMindBaseUrl+'jsonInterface?method=normalize_string&type=arabic_translit&text=';
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	226 url += text;
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	227 var resp = this._http.get(url, opts)
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	228 // filter result as JSON
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	229 .map(res => res.json());
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	230 // return Observable
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	231 return resp;
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	232 }
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	233 }

Mercurial > hg > ng2-query-ismi

annotate app/query.service.ts @ 13:98b435bb6c0c