Subversion Repositories SmartDukaan

Rev

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

Rev 108 Rev 199
Line 828... Line 828...
828
828
829 
		for(ExpandedSlide expSlide : expSlides) {
 829 
		for(ExpandedSlide expSlide : expSlides) {
830 
			List<ExpandedFeature> expFeatures = expSlide.getExpandedFeatures();
 830 
			List<ExpandedFeature> expFeatures = expSlide.getExpandedFeatures();
831
831
832 
			if(expSlide.getFreeformContent() != null) {
 832 
			if(expSlide.getFreeformContent() != null) {
833 
				ffc.add(expSlide.getFreeformContent().getContent());
 833 
				ffc.add(expSlide.getFreeformContent().getFreeformText());
834 
			}
 834 
			}
835
835
836 
			if(expFeatures == null) {
 836 
			if(expFeatures == null) {
837 
				continue;
 837 
				continue;
838 
			}
 838 
			}
Line 841... Line 841...
841 
				Long featureDefID =
841 
				Long featureDefID =
842 
					new Long(expFeature.getFeatureDefinitionID());
 842 
					new Long(expFeature.getFeatureDefinitionID());
843
843
844 
				// FFC at feature level
 844 
				// FFC at feature level
845 
				if(expFeature.getFreeformContent() != null) {
 845 
				if(expFeature.getFreeformContent() != null) {
846 
					ffc.add(expFeature.getFreeformContent().getContent());
 846 
					ffc.add(expFeature.getFreeformContent().getFreeformText());
847 
				}
 847 
				}
848
848
849 
				// Exclude those who are already covered as facets
 849 
				// Exclude those who are already covered as facets
850 
				if(facetFeatureIDs.contains(featureDefID)) {
 850 
				if(facetFeatureIDs.contains(featureDefID)) {
851 
					continue;
 851 
					continue;
Line 868... Line 868...
868 
				//<Value></Value>
 868 
				//<Value></Value>
869 
				for(ExpandedBullet bullet : expBullets) {
 869 
				for(ExpandedBullet bullet : expBullets) {
870
870
871 
					// FFC at bullet level
 871 
					// FFC at bullet level
872 
					if(bullet.getFreeformContent() != null) {
 872 
					if(bullet.getFreeformContent() != null) {
873 
						ffc.add(bullet.getFreeformContent().getContent());
 873 
						ffc.add(bullet.getFreeformContent().getFreeformText());
874 
					}
 874 
					}
875
875
876 
					xmlSnippet.add(this.xmlIndentation[indent + 1] + "<Value>" +
876 
					xmlSnippet.add(this.xmlIndentation[indent + 1] + "<Value>" +
877 
							StringEscapeUtils.escapeXml(bullet.getValue()) +
877 
							StringEscapeUtils.escapeXml(bullet.getValue()) +
878 
							"</Value>");
 878 
							"</Value>");