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

annotate app/query.service.ts @ 19:d75224bb8147

remove quotes for inverse relations.

author	casties
date	Thu, 21 Jan 2016 20:22:02 +0100
parents	65bb467abcc6
children	34cd764e234b

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
16 7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	13 //public neo4jBaseUrl = 'https://ismi-dev.mpiwg-berlin.mpg.de/neo4j-ismi/db/data';
7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	14 public neo4jBaseUrl = 'http://localhost:7474/db/data';
13 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/';
16 7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	16 //public openMindBaseUrl = 'http://localhost:18080/ismi-richfaces/';
7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	17 public excludedAttributes = {'type': true};
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	18 public invRelPrefix = '<- ';
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	19 public state: QueryState;
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	20 public ismiObjectTypes: any;
2 80270f5a5735 more tinkering. casties parents: 1 diff changeset	21
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	22 constructor(private _http: Http) {
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	23 this.state = {
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	24 'steps': [],
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	25 'resultCypherQuery': '',
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	26 'cypherQueryParams': {},
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	27 'attributesCypherQuery': '',
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	28 'relationsCypherQuery': '',
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	29 'results': [],
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	30 'resultTypes': '',
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	31 'numResults': 0,
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	32 'resultInfo': ''
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	33 };
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	34 }
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	35
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	36 setup() {
fa646ee46c19 more query generation. casties parents: 7 diff changeset	37 this.setupIsmiObjectTypes();
fa646ee46c19 more query generation. casties parents: 7 diff changeset	38 }
fa646ee46c19 more query generation. casties parents: 7 diff changeset	39
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	40 getState() {
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	41 return this.state;
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	42 }
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	43
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	44 getQueryModes(): QueryMode[] {
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	45 return QUERY_MODES;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	46 }
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	47
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	48 getQueryOptions(queryMode: QueryMode) {
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	49 var options = [];
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	50 if (queryMode == null) return options;
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	51 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	52 options = this.ismiObjectTypes;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	53 } 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	54 options = this.state.nextQueryRelations;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	55 } else if (queryMode.id === 'att_contains') {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	56 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	57 } 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	58 options = this.state.nextQueryAttributes;
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	59 } else if (queryMode.id === 'att_num_range') {
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	60 options = this.state.nextQueryAttributes;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	61 }
5 b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	62 console.debug("getQueryOptions returns: ", options);
b06a5d61afed new query state stuff. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 3 diff changeset	63 return options;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	64 }
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	65
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	66 setupIsmiObjectTypes() {
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	67 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	68 UNWIND labels AS label
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	69 RETURN DISTINCT label ORDER BY label`;
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	70
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	71 var res = this.fetchCypherResults([query]);
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	72 res.subscribe(
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	73 data => {
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	74 console.debug("neo4j data=", data);
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	75 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	76 console.debug("ismi types=", this.ismiObjectTypes);
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	77 },
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	78 err => console.error("neo4j error=", err),
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	79 () => console.debug('neo4j query Complete')
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	80 );
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	81 }
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	82
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	83 setQueryStep(index: number, step: QueryStep) {
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	84 this.state.steps[index] = step;
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	85 this.createCypherQuery();
9f5473536a98 more query generation. casties parents: 5 diff changeset	86 }
9f5473536a98 more query generation. casties parents: 5 diff changeset	87
9f5473536a98 more query generation. casties parents: 5 diff changeset	88 createCypherQuery() {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	89 var queryMatch = '';
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	90 var queryWhere = '';
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	91 var queryReturn = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	92 var queryParams = {};
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	93 var resultQuery = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	94 var attributesQuery = '';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	95 var relationsQuery = '';
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	96 var returnType = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	97 var nIdx = 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	98 this.state.steps.forEach((step, stepIdx) => {
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	99 /*
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	100 * step: object type is
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	101 */
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	102 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	103 queryMatch = `MATCH (n${nIdx}:${step.objectType})`;
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	104 queryWhere = '';
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	105 queryReturn = `RETURN n${nIdx}`;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	106 returnType = 'node';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	107 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	108
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	109 /*
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	110 * step: relation type is
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	111 */
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	112 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	113 nIdx += 1;
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	114 var rel = step.relationType;
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	115 if (rel.indexOf(this.invRelPrefix) == 0) {
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	116 // inverse relation
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	117 rel = rel.substr(this.invRelPrefix.length);
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	118 queryMatch += `<-[:${rel}]-(n${nIdx})`;
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	119 } else {
19 d75224bb8147 remove quotes for inverse relations. casties parents: 18 diff changeset	120 queryMatch += `-[:${rel}]->(n${nIdx})`;
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	121 }
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	122 queryReturn = `RETURN n${nIdx}`;
8 fa646ee46c19 more query generation. casties parents: 7 diff changeset	123 returnType = 'node';
fa646ee46c19 more query generation. casties parents: 7 diff changeset	124 }
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	125
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	126 /*
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	127 * step: attribute contains(_norm)
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	128 */
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	129 if (step.mode.id === 'att_contains' \|\| step.mode.id === 'att_contains_norm') {
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	130 if (!queryWhere) {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	131 queryWhere = 'WHERE ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	132 } else {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	133 queryWhere += ' AND ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	134 }
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	135 if (step.attribute === 'ismi_id') {
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	136 // ismi_id is integer
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	137 queryWhere += `n${nIdx}.ismi_id = {att_val${stepIdx}}`;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	138 queryParams[`att_val${stepIdx}`] = parseInt(step.value, 10);
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	139 } else {
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	140 if (step.mode.id === 'att_contains_norm') {
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	141 // match _n_attribute with normValue
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	142 queryWhere += `lower(n${nIdx}._n_${step.attribute}) CONTAINS lower({att_val${stepIdx}})`;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	143 queryParams[`att_val${stepIdx}`] = step.normValue;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	144 } else {
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	145 queryWhere += `lower(n${nIdx}.${step.attribute}) CONTAINS lower({att_val${stepIdx}})`;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	146 queryParams[`att_val${stepIdx}`] = step.value;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	147 }
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	148 }
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	149 }
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	150
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	151 /*
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	152 * step: attribute number range
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	153 */
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	154 if (step.mode.id === 'att_num_range') {
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	155 if (!queryWhere) {
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	156 queryWhere = 'WHERE ';
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	157 } else {
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	158 queryWhere += ' AND ';
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	159 }
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	160 queryWhere += `toint(n${nIdx}.${step.attribute}) >= toint({att_nlo${stepIdx}})`
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	161 + ` AND toint(n${nIdx}.${step.attribute}) <= toint({att_nhi${stepIdx}})`;
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	162 queryParams[`att_nlo${stepIdx}`] = step.numLo;
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	163 queryParams[`att_nhi${stepIdx}`] = step.numHi;
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	164 }
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	165
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	166 });
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	167 // compose query
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	168 resultQuery = queryMatch + '\n' + queryWhere + '\n' + queryReturn;
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	169 // compose query for attributes of result
15 f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	170 attributesQuery = queryMatch + ' ' + queryWhere + ` WITH DISTINCT keys(n${nIdx}) AS atts`
f84ff6781e57 added att_num_range query type. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 14 diff changeset	171 + ` UNWIND atts AS att RETURN DISTINCT att ORDER BY att`;
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	172 // compose query for relations of result
11 6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	173 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	174 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	175 this.state.cypherQueryParams = queryParams;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	176 this.state.attributesCypherQuery = attributesQuery;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	177 this.state.relationsCypherQuery = relationsQuery;
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	178 this.state.resultTypes = returnType;
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	179 }
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	180
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	181 updateQuery() {
6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	182 this.createCypherQuery();
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	183 this.state.resultInfo = 'loading...';
16 7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	184 /*
7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	185 * run query for result table
7d82ca32833c omit some attributes from list. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 15 diff changeset	186 */
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	187 var queries = [this.state.resultCypherQuery];
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	188 var params = [this.state.cypherQueryParams];
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	189 if (this.state.attributesCypherQuery) {
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	190 queries.push(this.state.attributesCypherQuery);
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	191 params.push(this.state.cypherQueryParams);
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	192 }
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	193 if (this.state.relationsCypherQuery) {
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	194 queries.push(this.state.relationsCypherQuery);
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	195 params.push(this.state.cypherQueryParams);
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	196 }
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	197 var res = this.fetchCypherResults(queries, params);
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	198 res.subscribe(
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	199 data => {
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	200 console.debug("neo4j result data=", data);
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	201 var resIdx = 0;
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	202 /*
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	203 * results for result table
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	204 */
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	205 this.state.results = data.results[resIdx].data.map(elem => elem.row[0]);
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	206 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	207 // count all types
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	208 var resTypes = {};
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	209 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	210 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	211 resTypes[r.type] = 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	212 } else {
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	213 resTypes[r.type] += 1;
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	214 }
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	215 });
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	216 var info = '';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	217 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	218 info += t + '(' + resTypes[t] + ') ';
6989cd00e8d7 relations work now as well as longer queries. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 10 diff changeset	219 }
14 7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	220 info = info.substr(0, info.length-1);
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	221 this.state.resultInfo = info;
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	222 // save info also in last step
7dc7ea95ca26 show result types below query steps. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 13 diff changeset	223 this.state.steps[this.state.steps.length-1].resultInfo = info;
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	224 /*
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	225 * results for attribute list
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	226 */
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	227 if (this.state.attributesCypherQuery) {
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	228 resIdx += 1;
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	229 this.state.nextQueryAttributes = data.results[resIdx].data.map(elem => elem.row[0])
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	230 .filter(elem => elem[0] != "_" && !this.excludedAttributes[elem]);
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	231 }
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	232 /*
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	233 * results for relations list
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	234 */
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	235 if (this.state.relationsCypherQuery) {
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	236 resIdx += 1;
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	237 var rels = data.results[resIdx].data.map(elem => elem.row[0])
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	238 .filter(elem => elem[0] != "_");
18 65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	239 // add inverse relations
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	240 var invrels = rels.concat(rels.map((r) => this.invRelPrefix + r));
65bb467abcc6 inverse relations are now generated on the fly. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 17 diff changeset	241 this.state.nextQueryRelations = invrels;
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	242 }
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	243 },
10 66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	244 err => console.error("neo4j result error=", err),
66dce99cef4e attribute contains works now. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 9 diff changeset	245 () => console.debug('neo4j result query Complete')
7 6cd6c09032aa object type query with results! Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 6 diff changeset	246 );
6 9f5473536a98 more query generation. casties parents: 5 diff changeset	247 }
9f5473536a98 more query generation. casties parents: 5 diff changeset	248
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	249 fetchCypherResults(queries: string[], params=[{}]) {
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	250 console.debug("fetching cypher queries: ", queries);
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	251 var headers = new Headers();
2 80270f5a5735 more tinkering. casties parents: 1 diff changeset	252 headers.append('Authorization', 'Basic ' + btoa('neo4j' + ':' + 'neo5j'));
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	253 headers.append('Content-Type', 'application/json');
59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	254 headers.append('Accept', 'application/json');
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	255 // put headers in options
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	256 var opts = {'headers': headers};
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	257 // unpack queries into statements
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	258 var statements = queries.map((q, i) => {
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	259 return {'statement': q, 'parameters': (params[i])?params[i]:{}};
f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	260 });
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	261 // create POST data from query
17 f6af2c8347de send multiple cypher queries in one request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 16 diff changeset	262 var data = JSON.stringify({'statements': statements});
3 c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	263 // make post request asynchronously
9 402c7229dc7c more query generation. casties parents: 8 diff changeset	264 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	265 // filter result as JSON
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	266 .map(res => res.json());
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	267 // return Observable
c741a00d38de first list of object types :-) Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 2 diff changeset	268 return resp;
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	269 }
13 98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	270
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	271 fetchNormalizedString(text: string) {
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	272 console.debug("fetching normalized string: ", text);
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	273 var headers = new Headers();
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	274 headers.append('Accept', 'application/json');
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	275 // put headers in options
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	276 var opts = {'headers': headers};
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	277 // make get request asynchronously
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	278 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	279 url += text;
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	280 var resp = this._http.get(url, opts)
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	281 // filter result as JSON
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	282 .map(res => res.json());
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	283 // return Observable
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	284 return resp;
98b435bb6c0c more query work. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: 12 diff changeset	285 }
1 59b7c3afcc6b first interface and http request. Robert Casties <casties@mpiwg-berlin.mpg.de> parents: diff changeset	286 }

Mercurial > hg > ng2-query-ismi

annotate app/query.service.ts @ 19:d75224bb8147