Subversion Repositories SmartDukaan

Rev

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

Rev 1081 Rev 1152
Line 231... Line 231...
231 
    	try {
 231 
    	try {
232 
    		long entityID = Long.parseLong(this.getId());
232 
    		long entityID = Long.parseLong(this.getId());
233 
    		entity = CreationUtils.getEntity(entityID);
 233 
    		entity = CreationUtils.getEntity(entityID);
234 
	    	Long catId = new Long(entity.getCategoryID());
 234 
	    	Long catId = new Long(entity.getCategoryID());
235 
	    	// Slides of entity's category
 235 
	    	// Slides of entity's category
236 
	    	String[] strSlideDefIDs = this.reqparams.get(
 236 
	    	String[] strSlideDefIDs = this.reqparams.get(new Long(entity.getCategoryID()).toString());
- 
 
 237
237 
	    			new Long(entity.getCategoryID()).toString());
 238
238
239
239 
	    	log.info("strSlideDefIDs:" + Arrays.toString(strSlideDefIDs));
 240 
	    	log.info("strSlideDefIDs:" + Arrays.toString(strSlideDefIDs));
240
241
- 
 
 242
- 
 
 243
241 
	    	List<Long> sequence= entity.getSlideSequence();
 244 
	    	List<Long> sequence= entity.getSlideSequence();
242 
	    	log.info("S1"+sequence);
 245 
	    	log.info("S1"+sequence);
243 
        	if(sequence == null){
 246 
        	if(sequence == null){
244 
        		sequence = new ArrayList<Long>();
 247 
        		sequence = new ArrayList<Long>();
245 
        		entity.setSlideSequence(sequence);
 248 
        		entity.setSlideSequence(sequence);
246 
        	}
 249 
        	}
247
250
248
251 
        	List<Long> newSequence = new ArrayList<Long>();
249
252
250 
	    	// Add entity's category slides first
 253 
	    	// Add entity's category slides first
251 
    		List<Long> slideDefIDs = new ArrayList<Long>();
 254 
    		List<Long> slideDefIDs = new ArrayList<Long>();
252 
    		for(String strSlideDefID : strSlideDefIDs) {
 255 
    		for(String strSlideDefID : strSlideDefIDs) {
- 
 
 256 
    			newSequence.add(new Long(Long.parseLong(strSlideDefID)));
253 
    			slideDefIDs.add(new Long(Long.parseLong(strSlideDefID)));
 257 
    			slideDefIDs.add(new Long(Long.parseLong(strSlideDefID)));
254 
    			if(!sequence.contains(new Long(Long.parseLong(strSlideDefID)))){
 258 
    			if(!sequence.contains(new Long(Long.parseLong(strSlideDefID)))){
255 
    				sequence.add(new Long(Long.parseLong(strSlideDefID)));
 259 
    				sequence.add(new Long(Long.parseLong(strSlideDefID)));
256 
    			}
 260 
    			}
257 
    		}
 261 
    		}
Line 265... Line 269...
265 
        	for(Category cat : cats) {
 269 
        	for(Category cat : cats) {
266 
        		Long lCat = new Long(cat.getID());
 270 
        		Long lCat = new Long(cat.getID());
267 
        		String[] strCatSlideDefIDs = this.reqparams.get(lCat.toString());
 271 
        		String[] strCatSlideDefIDs = this.reqparams.get(lCat.toString());
268 
        		if(strCatSlideDefIDs != null && strCatSlideDefIDs.length > 0) {
 272 
        		if(strCatSlideDefIDs != null && strCatSlideDefIDs.length > 0) {
269 
            		for(String strCatSlideDefID : strCatSlideDefIDs) {
 273 
            		for(String strCatSlideDefID : strCatSlideDefIDs) {
- 
 
 274 
            			newSequence.add(new Long(Long.parseLong(strCatSlideDefID)));
270 
            			if(!lCat.equals(catId) && !sequence.contains(new Long(Long.parseLong(strCatSlideDefID)))){
 275 
            			if(!lCat.equals(catId) && !sequence.contains(new Long(Long.parseLong(strCatSlideDefID)))){
271 
            				sequence.add(new Long(Long.parseLong(strCatSlideDefID)));
 276 
            				sequence.add(new Long(Long.parseLong(strCatSlideDefID)));
272 
            				log.info("S3"+sequence);
 277 
            				log.info("S3"+sequence);
273 
            			}
 278 
            			}
274 
            		}
 279 
            		}
Line 276... Line 281...
276 
        	}
 281 
        	}
277
282
278 
 
 283 
 
279 
        	//FIXME To remove not required slide ids and slides
 284 
        	//FIXME To remove not required slide ids and slides
280 
        	// to remove obsolete elements
 285 
        	// to remove obsolete elements
281 
        	/*
 - 
 
282 
        	List<Long> removeList = new ArrayList<Long>();
 - 
 
283
286
- 
 
 287 
        	List<Long> removeList = new ArrayList<Long>();
284 
        	for(Long slideId: sequence){
 288 
        	for(Long slideId: sequence){
285 
        		boolean isContains = false;
 289 
        		boolean isContains = false;
286 
        		for(List<Long> catwiseList: this.catSlides.values()){
 - 
 
287 
        			if(catwiseList.contains(slideId)){
 290 
        		if(newSequence.contains(slideId)){
288 
        				isContains = true;
 291 
        			isContains = true;
289 
        			}
 - 
 
290 
        		}
 292 
        		}
291 
        		if(!isContains){
 293 
        		if(!isContains){
292 
        			removeList.add(slideId);
 294 
        			removeList.add(slideId);
293 
        		}
 295 
        		}
294 
        	}
 296 
        	}
295 
        	log.info("To remove"+removeList);
 297 
        	log.info("To remove"+removeList);
296 
        	for(Long slideId: removeList){
 298 
        	for(Long slideId: removeList){
297 
        		sequence.remove(slideId);
 299 
        		sequence.remove(slideId);
298 
        	}
 300 
        	}
299 
        	*/
 - 
 
300 
        	// end
301 
        	// end
301
302
302
303
303 
	    	// Delete slides no longer present in the list
 304 
	    	// Delete slides no longer present in the list
304 
	    	List<Slide> slides = entity.getSlides();
 305 
	    	List<Slide> slides = entity.getSlides();