Subversion Repositories SmartDukaan

Rev

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

Rev 213 Rev 215
Line 287... Line 287...
287 
				// Store
 287 
				// Store
288 
				this.updateEntity(entity);
 288 
				this.updateEntity(entity);
289 
				//log.info("entity:" + entity);
 289 
				//log.info("entity:" + entity);
290 
			}
 290 
			}
291
291
- 
 
 292 
			// Skip will delete current slide from entity
- 
 
 293 
			else if(skip && currentSlideDefID != 0L) {
- 
 
 294 
				Entity entity = this.expEntity.getEntity();
- 
 
 295 
				entity.removeSlide(currentSlideDefID);
- 
 
 296
- 
 
 297 
				// Store
- 
 
 298 
				this.updateEntity(entity);
- 
 
 299 
				//log.info("entity:" + entity);
- 
 
 300 
			}
- 
 
 301
292 
			boolean showAnotherSlide = false;
 302 
			boolean showAnotherSlide = false;
293
303
294 
			// -2 : Not set
 304 
			// -2 : Not set
295 
			// -1 : Not found
 305 
			// -1 : Not found
296 
			int newCurrentIndex = -2;
306 
			int newCurrentIndex = -2;
Line 459... Line 469...
459 
		DefinitionsContainer defs = this.getDefinitionsContainer();
 469 
		DefinitionsContainer defs = this.getDefinitionsContainer();
460
470
461 
		List<Feature> features = new ArrayList<Feature>();
471 
		List<Feature> features = new ArrayList<Feature>();
462 
		for(SlideFeatureDefinition slideFeatureDef : slideFeatureDefs) {
 472 
		for(SlideFeatureDefinition slideFeatureDef : slideFeatureDefs) {
463 
			long featureDefinitionID = slideFeatureDef.getFeatureDefintionID();
 473 
			long featureDefinitionID = slideFeatureDef.getFeatureDefintionID();
464 
			log.info("featureDefinitionID:"+featureDefinitionID);
 474 
			log.info("featureDefinitionID:" + featureDefinitionID);
- 
 
 475
- 
 
 476 
			// Ignore skipped featured
- 
 
 477 
			String[] skipvalue =
- 
 
 478 
				this.reqparams.get(featureDefinitionID + "_skip");
- 
 
 479 
			log.info("skipvalue:" + Arrays.toString(skipvalue));
- 
 
 480
- 
 
 481 
			if(skipvalue != null && skipvalue.length > 0 &&
- 
 
 482 
					skipvalue[0].equals("on")) {
- 
 
 483 
				continue;
- 
 
 484 
			}
465
485
466 
			String featureDefIDString =
486 
			String featureDefIDString =
467 
				new Long(featureDefinitionID).toString();
 487 
				new Long(featureDefinitionID).toString();
468
488
469 
			Feature feature = new Feature(featureDefinitionID);
 489 
			Feature feature = new Feature(featureDefinitionID);
Line 940... Line 960...
940 
	 */
 960 
	 */
941 
	public ExpandedFeature getFeature(long featureDefinitionID)
961 
	public ExpandedFeature getFeature(long featureDefinitionID)
942 
		throws Exception {
 962 
		throws Exception {
943 
		EntityContainer ents = this.getEntityContainer();
 963 
		EntityContainer ents = this.getEntityContainer();
944
964
- 
 
 965 
		if(this.expSlide != null) {
- 
 
 966 
			Feature feature = ents.getFeature(
945 
		Feature feature = ents.getFeature(this.expSlide, featureDefinitionID);
 967 
					this.expSlide, featureDefinitionID);
- 
 
 968
946 
		if(feature == null) {
 969 
			if(feature == null) {
947 
			return null;
 970 
				return null;
- 
 
 971 
			}
- 
 
 972 
			return new ExpandedFeature(feature);
948 
		}
 973 
		}
949
974
950 
		return new ExpandedFeature(feature);
 975 
		return null;
951 
	}
 976 
	}
952
977
953 
	/**
 978 
	/**
954 
	 *
979 
	 *
955 
	 * @return
 980 
	 * @return