WebSVN – SmartDukaan – Diff – /trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java

 	private EntityContainer ents;
 	private DefinitionsContainer defs;
-	private long firstSlideID;
+	private long firstSlideDefID;
 	private ExpandedSlideDefinition expSlideDef;
 	private ExpandedSlide expSlide;
     	try {
 			this.expEntity = ents.getExpandedEntity(entityID);
 			//log.info("this.expEntity:" + this.expEntity);
 			long catID = this.expEntity.getCategoryID();
-			List<Long> slideIDs = defs.getCategorySlideSequence(catID);
+			List<Long> slideDefIDs = defs.getCategorySlideSequence(catID);
-			this.firstSlideID = slideIDs.get(0);
+			this.firstSlideDefID = slideDefIDs.get(0);
 		} catch (Exception e) {
 			log.error(CreationUtils.getStackTrace(e));
 			this.setErrorString(CreationUtils.getStackTrace(e));
 			return "fatal";
     	try {
 			this.expEntity = ents.getExpandedEntity(entityID);
 			//log.info("this.expEntity:" + this.expEntity);
-			long currentSlideID = 0L;
+			long currentSlideDefID = 0L;
-			long nextSlideID = 0L;
+			long nextSlideDefID = 0L;
-			long prevSlideID = 0L;
+			long prevSlideDefID = 0L;
-			String[] currentslideIDStrings =
+			String[] currentslideDefIDStrings =
-				this.reqparams.get("currentslideID");
+				this.reqparams.get("currentslideDefID");
+			String[] nextslideDefIDStrings =
-			String[] nextslideIDStrings = this.reqparams.get("nextslideID");
+				this.reqparams.get("nextslideDefID");
+			String[] prevslideDefIDStrings =
-			String[] prevslideIDStrings = this.reqparams.get("prevslideID");
+				this.reqparams.get("prevslideDefID");
 			// Current Slide ID
-			if(currentslideIDStrings != null &&
+			if(currentslideDefIDStrings != null &&
-					currentslideIDStrings.length > 0) {
+					currentslideDefIDStrings.length > 0) {
 				try {
-					currentSlideID = Long.parseLong(currentslideIDStrings[0]);
+					currentSlideDefID = Long.parseLong(
+							currentslideDefIDStrings[0]);
+				}
 				catch (NumberFormatException nfe) {}
+			}
 			// Next Slide ID
-			if(nextslideIDStrings != null &&
+			if(nextslideDefIDStrings != null &&
-					nextslideIDStrings.length > 0) {
+					nextslideDefIDStrings.length > 0) {
 				try {
-					nextSlideID = Long.parseLong(nextslideIDStrings[0]);
+					nextSlideDefID = Long.parseLong(nextslideDefIDStrings[0]);
+				}
 				catch (NumberFormatException nfe) {}
+			}
 			// Prev Slide ID
-			if(prevslideIDStrings != null &&
+			if(prevslideDefIDStrings != null &&
-					prevslideIDStrings.length > 0) {
+					prevslideDefIDStrings.length > 0) {
 				try {
-					prevSlideID = Long.parseLong(prevslideIDStrings[0]);
+					prevSlideDefID = Long.parseLong(prevslideDefIDStrings[0]);
+				}
 				catch (NumberFormatException nfe) {}
+			}
-			log.info("currentSlideID:" + currentSlideID);
+			log.info("currentSlideDefID:" + currentSlideDefID);
-			log.info("nextSlideID:" + nextSlideID);
+			log.info("nextSlideDefID:" + nextSlideDefID);
-			log.info("prevSlideID:" + prevSlideID);
+			log.info("prevSlideDefID:" + prevSlideDefID);
 			// Save on basic info page
-			if (this.reqparams.containsKey("save") && currentSlideID == 0L) {
+			if (this.reqparams.containsKey("save") && currentSlideDefID == 0L) {
 				log.info("Save");
 				Entity entity = this.expEntity.getEntity();
 				String categoryID = this.reqparams.get("category")[0];
 			this.reqparams.containsKey("prev");
 			// Save or Next or Prev - When editing a slide
 			int currentSlideIndex = 0;
-			currentSlideIndex = slideIDs.indexOf(new Long(currentSlideID));
+			currentSlideIndex = slideIDs.indexOf(new Long(currentSlideDefID));
 			log.info("currentSlideIndex:" + currentSlideIndex);
-			if(!skip && currentSlideID != 0L) {
+			if(!skip && currentSlideDefID != 0L) {
 				Entity entity = this.expEntity.getEntity();
-				// Update Entity Record
+				// Create new instance and override existing
-				Slide currentSlide = entity.getSlide(currentSlideID);
+				Slide currentSlide = this.createSlide(currentSlideDefID);
-				// Slide free-form content
-				FreeformContent slideFFC = this.getFreeformContent("slide");
-				log.info("slideFFC:" + slideFFC);
-				currentSlide.setFreeformContent(slideFFC);
-				//log.info("currentSlide:" + currentSlide);
-				// Collect Feature bullets
-				List<Feature> features = this.createFeatures(currentSlide);
-				log.info("features:" + features);
-				currentSlide.setFeatures(features);
+				entity.addSlide(currentSlide);
 				// Store
 				this.updateEntity(entity);
 				//log.info("entity:" + entity);
+			}
 			int newCurrentIndex = -2;
 			int newNextIndex = -2;
 			int newPrevIndex = -2;
 			// Next
-			if(next && nextSlideID != 0L) {
+			if(next && nextSlideDefID != 0L) {
 				log.info("Next");
 				// Decide on next slide ID
-				int nextSlideIndex = slideIDs.indexOf(new Long(nextSlideID));
+				int nextSlideIndex = slideIDs.indexOf(new Long(nextSlideDefID));
 				log.info("nextSlideIndex:"+nextSlideIndex);
 				// New Current
 				if (nextSlideIndex == -1) {
-					this.setErrorString("Invalid Next slide ID " + nextSlideID);
+					this.setErrorString("Invalid Next slide ID " +
+							nextSlideDefID);
 					return "fatal";
+				}
 				newCurrentIndex = nextSlideIndex;
 				if (newCurrentIndex != slideIDs.size()-1) {
 					newNextIndex = newCurrentIndex + 1;
+				}
 				// New Prev.
-				if(currentSlideID != 0L) {
+				if(currentSlideDefID != 0L) {
 					newPrevIndex = currentSlideIndex;
+				}
 				showAnotherSlide = true;
+			}
 			// Prev
-			if(prev && prevSlideID != 0L) {
+			if(prev && prevSlideDefID != 0L) {
 				log.info("Prev");
 				// Decide on prev slide ID
-				int prevSlideIndex = slideIDs.indexOf(new Long(prevSlideID));
+				int prevSlideIndex = slideIDs.indexOf(new Long(prevSlideDefID));
 				log.info("prevSlideIndex:" + prevSlideIndex);
 				if (prevSlideIndex == -1) {
-					this.setErrorString("Invalid Prev slide ID " + prevSlideID);
+					this.setErrorString("Invalid Prev slide ID " +
+							prevSlideDefID);
 					return "fatal";
+				}
 				// New Next
-				if(currentSlideID != 0L) {
+				if(currentSlideDefID != 0L) {
 					newNextIndex = currentSlideIndex;
+				}
 				// New Current
 				newCurrentIndex = prevSlideIndex;
 				showAnotherSlide = true;
+			}
 			if(showAnotherSlide) {
- 				log.info("newCurrentIndex:"+newCurrentIndex);
+ 				log.info("newCurrentIndex:" + newCurrentIndex);
-				log.info("newNextIndex:"+newNextIndex);
+				log.info("newNextIndex:" + newNextIndex);
-				log.info("newPrevIndex:"+newPrevIndex);
+				log.info("newPrevIndex:" + newPrevIndex);
 				if(newCurrentIndex != -2) {
 					this.setNewCurrentSlideDefinitionID(
 							slideIDs.get(newCurrentIndex).longValue());
+				}
 			return "fatal";
+    	}
         return "success";
+    }
+    /**
+     *
+     * @param slideDefID
+     * @return
+     * @throws Exception
+     */
+    private Slide createSlide(long slideDefID) throws Exception {
+		Slide slide = new Slide(slideDefID);
+		// Slide free-form content
+		FreeformContent slideFFC = this.getFreeformContent(
+				"slide_" + slideDefID);
+		log.info("slideFFC:" + slideFFC);
+		slide.setFreeformContent(slideFFC);
+		//log.info("currentSlide:" + currentSlide);
+		// Collect Feature bullets
+		List<Feature> features = this.createFeatures(slide);
+		log.info("features:" + features);
+		slide.setFeatures(features);
+		// Collect children slides
+		SlideDefinition slideDef =
+			this.getDefinitionsContainer().getSlideDefinition(slideDefID);
+		List<Long> childrenSlideIDs = slideDef.getChildrenSlideDefinitionIDs();
+		if(childrenSlideIDs != null) {
+			List<Slide> childrenSlides = new ArrayList<Slide>();
+			for (Long childSlideID : childrenSlideIDs) {
+				Slide childSlide = this.createSlide(childSlideID.longValue());
+				if(childSlide != null) {
+					childrenSlides.add(childSlide);
+				}
+			}
+			slide.setChildrenSlides(childrenSlides);
+		}
+		return slide;
+    }
     /**
+     *
      * @param slide
      * @return
      * @throws Exception
+		}
 		log.info("ffc:" + ffc);
 		return ffc;
+	}
+    /**
+     *
+     * @param slideDefinitionID
+     * @return
+     */
+	public ExpandedSlide getChildSlide(long slideDefinitionID) {
+		return this.getChildSlide(this.expSlide, slideDefinitionID);
+	}
+    /**
+     *
+     * @param expSlide
+     * @param slideDefinitionID
+     * @return
+     */
+	public ExpandedSlide getChildSlide(ExpandedSlide expSlide,
+			long slideDefinitionID) {
+		List<ExpandedSlide> childrenSlides =
+			expSlide.getExpandedChildrenSlides();
+		ExpandedSlide resultSlide = null;
+		if(childrenSlides != null) {
+			for(ExpandedSlide childSlide : childrenSlides) {
+				if(childSlide.getSlideDefinitionID() == slideDefinitionID) {
+					return childSlide;
+				}
+				resultSlide = this.getChildSlide(childSlide, slideDefinitionID);
+				if(resultSlide == null) {
+					continue;
+				}
+				else {
+					break;
+				}
+			}
+		}
+		return resultSlide;
+	}
 	/**
 	 * @return the entities
 	 */
 	public Collection<Entity> getEntities() {
 	 * @return the current slide to edit
 	 */
 	public ExpandedSlideDefinition getExpandedSlideDefinition() {
 		return expSlideDef;
+	}
+	/**
+	 *
+	 * @param slideDefID
+	 * @return
+	 */
+	public ExpandedSlideDefinition getExpandedSlideDefinition(long slideDefID) {
+		DefinitionsContainer defs = this.getDefinitionsContainer();
+		try {
+			return defs.getExpandedSlideDefinition(slideDefID);
+		} catch (Exception e) {
+			return null;
+		}
+	}
 	/**
+     *
      * @param id
      */
+    }
 	/**
 	 * @return the firstSlideID
 	 */
-	public long getFirstSlideID() {
+	public long getFirstSlideDefID() {
-		return firstSlideID;
+		return firstSlideDefID;
+	}
 	@Override
 	public void setParameters(Map<String, String[]> reqmap) {
 		log.info("setParameters:" + reqmap);

Subversion Repositories SmartDukaan

(root)/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java @ 213 – Rev 210 → 213