Subversion Repositories SmartDukaan

Rev

Rev 7975 | Rev 8093 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7975 Rev 8024
Line 93... Line 93...
93 
			Category category = Catalog.getInstance().getDefinitionsContainer().getCategory(categoryId);
 93 
			Category category = Catalog.getInstance().getDefinitionsContainer().getCategory(categoryId);
94
94
95 
            if(category.isComparable()) {
 95 
            if(category.isComparable()) {
96 
            	ExpandedEntity expEntity = new ExpandedEntity(entity);
 96 
            	ExpandedEntity expEntity = new ExpandedEntity(entity);
97 
 
 97 
 
98 
            	Map<Long, Double> slideScores = this.getSlideScores(expEntity);
 98 
            	Map<Long, Double> slideScores = this.getSlideScores(expEntity, true);
99 
            	slideScoresByEntityID.put(entity.getID(), slideScores);
 99 
            	slideScoresByEntityID.put(entity.getID(), slideScores);
100 
			}
 100 
			}
101 
		}
 101 
		}
102
102
103 
		return slideScoresByEntityID;
 103 
		return slideScoresByEntityID;
Line 115... Line 115...
115 
			}
 115 
			}
116 
			Category category = Catalog.getInstance().getDefinitionsContainer().getCategory(categoryId);
 116 
			Category category = Catalog.getInstance().getDefinitionsContainer().getCategory(categoryId);
117
117
118 
				ExpandedEntity expEntity = new ExpandedEntity(entity);
 118 
				ExpandedEntity expEntity = new ExpandedEntity(entity);
119
119
120 
				Map<Long, Double> slideScores = this.getSlideScores(expEntity);
 120 
				Map<Long, Double> slideScores = this.getSlideScores(expEntity, false);
121 
				slideScoresByEntityID.put(entity.getID(), slideScores);
 121 
				slideScoresByEntityID.put(entity.getID(), slideScores);
122 
		}
 122 
		}
123
123
124 
		return slideScoresByEntityID;
 124 
		return slideScoresByEntityID;
125 
	}
 125 
	}
Line 128... Line 128...
128 
	 *
128 
	 *
129 
	 * @param entity
 129 
	 * @param entity
130 
	 * @return Map<Long, Double>
 130 
	 * @return Map<Long, Double>
131 
	 * @throws Exception
131 
	 * @throws Exception
132 
	 */
 132 
	 */
133 
	private Map<Long, Double> getSlideScores(ExpandedEntity expEntity) throws Exception {
 133 
	private Map<Long, Double> getSlideScores(ExpandedEntity expEntity, boolean isCustomized) throws Exception {
134 
		Map<Long, Double> slideScores = new HashMap<Long, Double>();
 134 
		Map<Long, Double> slideScores = new HashMap<Long, Double>();
135
135
136 
		DefinitionsContainer defs =
136 
		DefinitionsContainer defs =
137 
			Catalog.getInstance().getDefinitionsContainer();
 137 
			Catalog.getInstance().getDefinitionsContainer();
138
138
139 
		// Python wrapper for executing rule in python script
 139 
		// Python wrapper for executing rule in python script
140 
		CMPJythonWrapper cmpJW = new CMPJythonWrapper();
 140 
		CMPJythonWrapper cmpJW = new CMPJythonWrapper();
- 
 
 141 
		Map<Long, Double> customScores = CreationUtils.getCustomSlideComparisonScores(expEntity.getID());
141
142
142 
		// Scores are required for parent slides only
 143 
		// Scores are required for parent slides only
143 
		List<ExpandedSlide> expSlides = expEntity.getExpandedSlides();
 144 
		List<ExpandedSlide> expSlides = expEntity.getExpandedSlides();
144 
		if(expSlides==null){
 145 
		if(expSlides==null){
145 
			return slideScores;
 146 
			return slideScores;
146 
		}
 147 
		}
147 
		for(ExpandedSlide expSlide : expSlides) {
 148 
		for(ExpandedSlide expSlide : expSlides) {
- 
 
 149 
			long slideDefinitionID = expSlide.getSlideDefinitionID();
- 
 
 150
- 
 
 151 
			if(isCustomized && customScores.containsKey(slideDefinitionID)){
- 
 
 152 
				slideScores.put(slideDefinitionID, customScores.get(slideDefinitionID));
- 
 
 153 
				continue;
- 
 
 154 
			}
148 
			cmpJW.reset();
 155 
			cmpJW.reset();
149 
			cmpJW.initialize();
 156 
			cmpJW.initialize();
150
157
151 
			cmpJW.setExpandedSlide(expSlide);
 158 
			cmpJW.setExpandedSlide(expSlide);
152 
			cmpJW.setCategory(expEntity.getCategory());
 159 
			cmpJW.setCategory(expEntity.getCategory());
153
160
154 
			long slideDefinitionID = expSlide.getSlideDefinitionID();
 - 
 
155 
			ExpandedCMPSlideRuleDefinition expCMPSlideRuleDef =
161 
			ExpandedCMPSlideRuleDefinition expCMPSlideRuleDef =
156 
				defs.getExpandedComparisonSlideRuleDefinition(
 162 
				defs.getExpandedComparisonSlideRuleDefinition(
157 
						slideDefinitionID);
 163 
						slideDefinitionID);
158
164
159 
			if(expCMPSlideRuleDef == null) {
 165 
			if(expCMPSlideRuleDef == null) {