Subversion Repositories SmartDukaan

Rev

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

Rev 499 Rev 953
Line 53... Line 53...
53 
	private EntityContainer ents;
 53 
	private EntityContainer ents;
54 
	private DefinitionsContainer defs;
 54 
	private DefinitionsContainer defs;
55 
	private List<List<String[]>> allSlidesData =
55 
	private List<List<String[]>> allSlidesData =
56 
		new ArrayList<List<String[]>>();
 56 
		new ArrayList<List<String[]>>();
57
57
- 
 
 58 
	/**
- 
 
 59 
	 * Key: Slide Definition Id
- 
 
 60 
	 * Value: Category Slide Definition
- 
 
 61 
	 */
58 
	private Map<Long, CategorySlideDefinition> mapAllCatSlideDefs =
62 
	private Map<Long, CategorySlideDefinition> mapAllCatSlideDefs =
59 
		new HashMap<Long, CategorySlideDefinition>();
 63 
		new HashMap<Long, CategorySlideDefinition>();
60 
 
 64 
 
61 
	private Map<Long, List<Long>> catSlides;
 65 
	private Map<Long, List<Long>> catSlides;
62 
 
 66 
 
Line 92... Line 96...
92 
			List<Category> cats = defs.getChildrenCategories(parentCatID);
 96 
			List<Category> cats = defs.getChildrenCategories(parentCatID);
93 
			for(Category cat : cats) {
 97 
			for(Category cat : cats) {
94 
				if(cat.getID() != catID) {
 98 
				if(cat.getID() != catID) {
95 
					List<String[]> thisSlidesData =
99 
					List<String[]> thisSlidesData =
96 
						this.getSlidesData(cat.getID(), selection, false);
 100 
						this.getSlidesData(cat.getID(), selection, false);
97
101 
					if(!thisSlidesData.isEmpty()){
98 
					this.allSlidesData.add(thisSlidesData);
 102 
						this.allSlidesData.add(thisSlidesData);
- 
 
 103 
					}
99 
				}
 104 
				}
100 
			}
 105 
			}
101
106
102 
		} catch (Exception e) {
 107 
		} catch (Exception e) {
103 
			log.error(CreationUtils.getStackTrace(e));
 108 
			log.error(CreationUtils.getStackTrace(e));
Line 432... Line 437...
432 
			// Do not repeat if already covered
 437 
			// Do not repeat if already covered
433 
			if(excludeList.contains(slideDefID)) {
 438 
			if(excludeList.contains(slideDefID)) {
434 
				continue;
 439 
				continue;
435 
			}
 440 
			}
436
441
437 
			CategorySlideDefinition catSlideDef =
442 
			// Category slide definition for the slide def id.
- 
 
 443 
			CategorySlideDefinition catSlideDef = this.mapAllCatSlideDefs.get(slideDefID);
438 
				this.mapAllCatSlideDefs.get(slideDefID);
 444 
			log.info("catSlideDef: " + catSlideDef);
439
445
440 
			String slideLabel = defs.getSlideDefinition(
 - 
 
441 
					catSlideDef.getSlideDefintionID()).getLabel();
 446 
			String slideLabel = defs.getSlideDefinition(catSlideDef.getSlideDefintionID()).getLabel();
442
447
443 
			Long lSlideDefID = new Long(catSlideDef.getSlideDefintionID());
 448 
			Long lSlideDefID = new Long(catSlideDef.getSlideDefintionID());
444
449
445 
			String selected = "0";
 450 
			String selected = "0";
446 
			if(selection != null) {
 451 
			if(selection != null) {