You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by ql...@apache.org on 2016/08/12 14:36:09 UTC
[1/3] incubator-unomi git commit: UNOMI-53 : goalMatchCondition :
comparisonOperator as a parameter
Repository: incubator-unomi
Updated Branches:
refs/heads/master 30a51a23d -> 7e372f3ac
UNOMI-53 : goalMatchCondition : comparisonOperator as a parameter
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/7e372f3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/7e372f3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/7e372f3a
Branch: refs/heads/master
Commit: 7e372f3ac0e0275987400bf1521faf3a640bc9b5
Parents: 44fd045
Author: Abdelkader Midani <am...@jahia.com>
Authored: Fri Aug 12 16:29:00 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Fri Aug 12 16:29:32 2016 +0200
----------------------------------------------------------------------
.../META-INF/cxs/conditions/goalMatchCondition.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/7e372f3a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
index 36a57ba..6c4e796 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
@@ -13,7 +13,7 @@
"type": "profilePropertyCondition",
"parameterValues": {
"propertyName": "script::'systemProperties.goals.'+goalId+'TargetReached'",
- "comparisonOperator": "exists"
+ "comparisonOperator": "parameter::comparisonOperator"
}
},
@@ -22,6 +22,12 @@
"id": "goalId",
"type": "string",
"multivalued": false
+ },
+ {
+ "id": "comparisonOperator",
+ "type": "string",
+ "multivalued": false,
+ "defaultValue": "exists"
}
]
}
\ No newline at end of file
[2/3] incubator-unomi git commit: UNOMI-52 : Review conditions tags
Posted by ql...@apache.org.
UNOMI-52 : Review conditions tags
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/44fd0459
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/44fd0459
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/44fd0459
Branch: refs/heads/master
Commit: 44fd0459b364c4cfe3572d6632f839fa958a254c
Parents: 9df17f7
Author: Abdelkader Midani <am...@jahia.com>
Authored: Thu Aug 11 10:03:59 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Fri Aug 12 16:29:32 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/cxs/conditions/newVisitorCondition.json | 2 +-
.../META-INF/cxs/conditions/returningVisitorCondition.json | 2 +-
.../META-INF/cxs/conditions/sessionDurationCondition.json | 2 +-
.../META-INF/cxs/conditions/sessionPropertyCondition.json | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/44fd0459/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
index 27db6f3..6bdb2f6 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
@@ -4,7 +4,7 @@
"name": "newVisitorCondition",
"description": "",
"tags": [
- "demographic",
+ "event",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/44fd0459/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
index e314241..2ecf315 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
@@ -4,7 +4,7 @@
"name": "returningVisitorCondition",
"description": "",
"tags": [
- "demographic",
+ "event",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/44fd0459/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
index c57d204..f55b85c 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
@@ -4,7 +4,7 @@
"name": "sessionDurationCondition",
"description": "",
"tags": [
- "demographic",
+ "event",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/44fd0459/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
index c01dac5..3c3328a 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
@@ -4,7 +4,7 @@
"name": "sessionPropertyCondition",
"description": "",
"tags": [
- "demographic",
+ "event",
"sessionCondition"
],
"readOnly": true
[3/3] incubator-unomi git commit: UNOMI-51 : Scoring modifiers are
ignored when the score value is updated
Posted by ql...@apache.org.
UNOMI-51 : Scoring modifiers are ignored when the score value is updated
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9df17f70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9df17f70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9df17f70
Branch: refs/heads/master
Commit: 9df17f70988988fc9dc4a1b7cb7c6826e2fe1a54
Parents: 30a51a2
Author: Abdelkader Midani <am...@jahia.com>
Authored: Wed Aug 10 16:17:04 2016 +0200
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Fri Aug 12 16:29:32 2016 +0200
----------------------------------------------------------------------
.../org/apache/unomi/services/services/SegmentServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9df17f70/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
index bd68971..c82aad2 100644
--- a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
@@ -851,7 +851,7 @@ public class SegmentServiceImpl implements SegmentService, SynchronousBundleList
scriptParams.put("scoringId", scoring.getItemId());
for (Profile profileToRemove : previousProfiles) {
- persistenceService.updateWithScript(profileToRemove.getItemId(), null, Profile.class, "ctx._source.scores.remove(scoringId)", scriptParams);
+ persistenceService.updateWithScript(profileToRemove.getItemId(), null, Profile.class, "if (ctx._source.systemProperties.scoreModifiers == null) { ctx._source.systemProperties.scoreModifiers=[:] } ; if (ctx._source.systemProperties.scoreModifiers.containsKey(scoringId)) { ctx._source.scores[scoringId] = ctx._source.systemProperties.scoreModifiers[scoringId] } else { ctx._source.scores.remove(scoringId) }", scriptParams);
}
if(scoring.getMetadata().isEnabled()) {
String script = "if (ctx._source.scores == null) { ctx._source.scores=[:] } ; if (ctx._source.scores.containsKey(scoringId)) { ctx._source.scores[scoringId] += scoringValue } else { ctx._source.scores[scoringId] = scoringValue }";