Subversion Repositories SmartDukaan

Rev

Rev 82 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 82 Rev 90
Line 186... Line 186...
186
186
187 
			Map<String, Integer> bucketScores = new HashMap<String, Integer>();
 187 
			Map<String, Integer> bucketScores = new HashMap<String, Integer>();
188 
			Map<String, Integer> bucketSlideCounts =
188 
			Map<String, Integer> bucketSlideCounts =
189 
				new HashMap<String, Integer>();
 189 
				new HashMap<String, Integer>();
190
190
191 
			// Initialize scores
 - 
 
192 
			for(CMPBucketDefinition bucketDef : bucketDefs) {
 - 
 
193 
				bucketScores.put(bucketDef.getName(), new Integer(0));
 - 
 
194 
				bucketSlideCounts.put(bucketDef.getName(), new Integer(0));
 - 
 
195 
			}
 - 
 
196
- 
 
197 
			for(Long slideDefinitionID : slideScores.keySet()) {
 191 
			for(Long slideDefinitionID : slideScores.keySet()) {
198 
				Integer slideScore = slideScores.get(slideDefinitionID);
 192 
				Integer slideScore = slideScores.get(slideDefinitionID);
199
193
- 
 
 194 
				Slide slide = ents.getSlide(entityID, slideDefinitionID);
- 
 
 195
- 
 
 196 
				String bucketName = null;
- 
 
 197 
				if(slide.isBorrowed()) {
- 
 
 198 
					long borrowedCategoryID = slide.getBorrowedCategoryID();
- 
 
 199
- 
 
 200 
					bucketName = defs.getComparisonBucketName(
- 
 
 201 
							borrowedCategoryID, slideDefinitionID.longValue());
- 
 
 202 
				}
- 
 
 203 
				else {
200 
				String bucketName = defs.getComparisonBucketName(categoryID,
204 
					bucketName = defs.getComparisonBucketName(categoryID,
201 
						slideDefinitionID.longValue());
 205 
						slideDefinitionID.longValue());
- 
 
 206 
				}
202
207
203 
				if(bucketName == null) {
 208 
				if(bucketName == null) {
204 
					Utils.warning("Comparison bucket not defined for Category ID="+
 209 
					Utils.warning("Comparison bucket not defined for " +
205 
							categoryID + " Slide Definition ID=" +
210 
							"Category ID=" + categoryID +
206 
							slideDefinitionID);
 211 
							" Slide Definition ID=" + slideDefinitionID);
207
212
208 
					continue;
 213 
					continue;
209 
				}
 214 
				}
- 
 
 215 
 
- 
 
 216 
				if(!bucketScores.containsKey(bucketName)) {
- 
 
 217 
					bucketScores.put(bucketName, new Integer(0));
- 
 
 218 
				}
- 
 
 219
- 
 
 220 
				if(!bucketSlideCounts.containsKey(bucketName)) {
- 
 
 221 
					bucketSlideCounts.put(bucketName, new Integer(0));
- 
 
 222 
				}
210
223
211 
				Integer bucketScore = bucketScores.get(bucketName);
 224 
				Integer bucketScore = bucketScores.get(bucketName);
212 
				Integer bucketSlideCount = bucketSlideCounts.get(bucketName);
 225 
				Integer bucketSlideCount = bucketSlideCounts.get(bucketName);
213
226
- 
 
 227
214 
				Integer newBucketScore =  new Integer(
 228 
				Integer newBucketScore =  new Integer(
215 
						bucketScore.intValue() + slideScore.intValue());
 229 
						bucketScore.intValue() + slideScore.intValue());
216
230
217 
				Integer newBucketSlideCount =  new Integer(
 231 
				Integer newBucketSlideCount =  new Integer(
218 
						bucketSlideCount.intValue() + 1);
 232 
						bucketSlideCount.intValue() + 1);