owl-cli 6.117.0 → 6.119.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/bin/owl.js
CHANGED
|
@@ -80,7 +80,13 @@ function getIndexMapping(flatternedSpecs){
|
|
|
80
80
|
}
|
|
81
81
|
else if(field.fieldType == 'string'){
|
|
82
82
|
propMappings[field.key] = {
|
|
83
|
-
"type":"text"
|
|
83
|
+
"type":"text",
|
|
84
|
+
"fields": {
|
|
85
|
+
"keyword": {
|
|
86
|
+
"type": "keyword",
|
|
87
|
+
"ignore_above": 256
|
|
88
|
+
}
|
|
89
|
+
}
|
|
84
90
|
};
|
|
85
91
|
}
|
|
86
92
|
}
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
var nAdded = 0;
|
|
18
18
|
var nUpdated = 0;
|
|
19
19
|
var nExists = 0;
|
|
20
|
+
var nError = 0;
|
|
20
21
|
|
|
21
22
|
try {
|
|
22
23
|
var params = JSON.parse( $body );
|
|
@@ -24,39 +25,48 @@
|
|
|
24
25
|
//判断是add还是update
|
|
25
26
|
var objs = params.objs;
|
|
26
27
|
var action = params.action;
|
|
27
|
-
|
|
28
|
+
var errs = [];
|
|
28
29
|
for(var i=0; i<objs.length; i++){
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
try{
|
|
31
|
+
var modelObject = objs[i];
|
|
32
|
+
var id = modelObject.id;
|
|
33
|
+
var oldObj = @projectCodeService.get(id);
|
|
34
|
+
if(action=='add'){
|
|
35
|
+
if(!oldObj){
|
|
36
|
+
modelObject.m = env.m;
|
|
37
|
+
var newdata = @projectCodeService.add( modelObject,env );
|
|
38
|
+
nAdded = nAdded + 1;
|
|
39
|
+
}
|
|
40
|
+
else{
|
|
41
|
+
nExists = nExists + 1;
|
|
42
|
+
}
|
|
37
43
|
}
|
|
38
|
-
else{
|
|
39
|
-
|
|
44
|
+
else if(action==='force'){
|
|
45
|
+
if(!oldObj){
|
|
46
|
+
modelObject.m = env.m;
|
|
47
|
+
var newdata = @projectCodeService.add( modelObject,env );
|
|
48
|
+
nAdded = nAdded + 1;
|
|
49
|
+
}
|
|
50
|
+
else{
|
|
51
|
+
modelObject._v = oldObj._v;
|
|
52
|
+
var newdata = @projectCodeService.update( modelObject,env);
|
|
53
|
+
nUpdated = nUpdated + 1;
|
|
54
|
+
}
|
|
40
55
|
}
|
|
41
56
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
var newdata = @projectCodeService.add( modelObject,env );
|
|
46
|
-
nAdded = nAdded + 1;
|
|
47
|
-
}
|
|
48
|
-
else{
|
|
49
|
-
modelObject._v = oldObj._v;
|
|
50
|
-
var newdata = @projectCodeService.update( modelObject,env);
|
|
51
|
-
nUpdated = nUpdated + 1;
|
|
52
|
-
}
|
|
57
|
+
catch(e){
|
|
58
|
+
errs.push("id=" + id + " " + e.msg || e + "");
|
|
59
|
+
nError++;
|
|
53
60
|
}
|
|
61
|
+
|
|
54
62
|
}
|
|
55
63
|
var ret = {
|
|
56
64
|
state:'ok',
|
|
57
65
|
added:nAdded,
|
|
58
66
|
updated:nUpdated,
|
|
59
|
-
|
|
67
|
+
errored:nError,
|
|
68
|
+
exists:nExists,
|
|
69
|
+
errs:errs
|
|
60
70
|
}
|
|
61
71
|
out.print( JSON.stringify( ret ) );
|
|
62
72
|
} catch ( e ) {
|
|
@@ -31,8 +31,7 @@
|
|
|
31
31
|
}
|
|
32
32
|
if(parentId && parentId!=='0'){
|
|
33
33
|
searchArgs['parent_id'] = parentId;
|
|
34
|
-
|
|
35
|
-
var obj = @projectCodeService.search("0",searchArgs,null,0, 10000,null);
|
|
34
|
+
var obj = @projectCodeService.search(null,searchArgs,null,0, 10000,null);
|
|
36
35
|
var total = obj.total;
|
|
37
36
|
var list = obj.list;
|
|
38
37
|
var ret = {
|