Subversion Repositories SmartDukaan

Rev

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

Rev 29 Rev 32
Line 29... Line 29...
29 
import java.io.FileReader;
 29 
import java.io.FileReader;
30 
import java.io.LineNumberReader;
 30 
import java.io.LineNumberReader;
31 
import java.util.ArrayList;
 31 
import java.util.ArrayList;
32 
import java.util.Collection;
 32 
import java.util.Collection;
33 
import java.util.HashMap;
 33 
import java.util.HashMap;
34 
import java.util.Iterator;
 - 
 
35 
import java.util.List;
 34 
import java.util.List;
36 
import java.util.Map;
 35 
import java.util.Map;
37 
import java.util.TreeMap;
 36 
import java.util.TreeMap;
38 
 
 37 
 
39 
import org.apache.commons.lang.ArrayUtils;
 38 
import org.apache.commons.lang.ArrayUtils;
Line 284... Line 283...
284 
			new HashMap<String, Map<Integer, String>>();
 283 
			new HashMap<String, Map<Integer, String>>();
285
284
286 
		for(String slideName : slideNames.values()) {
 285 
		for(String slideName : slideNames.values()) {
287 
			//Utils.logger.info("slideName=" + slideName);
 286 
			//Utils.logger.info("slideName=" + slideName);
288 
			List<SlideDefinition> slideDefs =
287 
			List<SlideDefinition> slideDefs =
289 
				defs.getSlideDefinitions(slideName);
 288 
				defs.getSlideDefinitions(this.categoryID, slideName);
290
289
291 
			if(slideDefs == null) {
 290 
			if(slideDefs == null) {
292 
				continue;
 291 
				continue;
293 
			}
 292 
			}
294
293
Line 458... Line 457...
458
457
459 
		String crumb = "\"" + slideDef.getLabel() + "\" > \"" +
458 
		String crumb = "\"" + slideDef.getLabel() + "\" > \"" +
460 
			featureDef.getLabel() + "\"";
 459 
			featureDef.getLabel() + "\"";
461
460
462 
		// Enforce isMultivalue
 461 
		// Enforce isMultivalue
- 
 
 462 
		// RE-VISIT - This validation should be inside for loop below
- 
 
 463 
		// Skipping for now this may not be a common error
- 
 
 464 
		/*
463 
		if(!bulletDef.isMultivalue() && (from != to)) {
 465 
		if(!bulletDef.isMultivalue() && (from != to)) {
464 
			Utils.logger.severe("Only one bullet is allowed for " + crumb);
 466 
			Utils.logger.severe("Only one bullet is allowed for " + crumb);
465 
			return;
 467 
			return;
466 
		}
 468 
		}
- 
 
 469 
		*/
467 
 
 470 
 
468 
		// If unit is defined
 471 
		// If unit is defined
469 
		Unit unitDef =  null;
 472 
		Unit unitDef =  null;
470 
		if(bulletDef.getUnitID() != 0L) {
 473 
		if(bulletDef.getUnitID() != 0L) {
471 
			long unitID = bulletDef.getUnitID();
 474 
			long unitID = bulletDef.getUnitID();
Line 511... Line 514...
511 
		for(int i=from; i<to+1; i++) {
 514 
		for(int i=from; i<to+1; i++) {
512 
			String line = allLines.get(i);
 515 
			String line = allLines.get(i);
513 
			Utils.logger.info("Line " + i + ": " + line);
 516 
			Utils.logger.info("Line " + i + ": " + line);
514 
 
 517 
 
515 
			// VALIDATE
 518 
			// VALIDATE
516 
			// If means free-form content formatted at feature level
 519 
			// It means free-form content formatted at feature level
517 
			// Assume there are no more bullets
 520 
			// Assume there are no more bullets
518 
			if(StringUtils.startsWith(line, CN.PATTERN_LEVEL_1)) {
 521 
			if(StringUtils.startsWith(line, CN.PATTERN_LEVEL_1)) {
519 
				break;
 522 
				break;
520 
			}
 523 
			}
521
524
Line 802... Line 805...
802
805
803 
		// Get all feature definitions for the slide
 806 
		// Get all feature definitions for the slide
804 
		DefinitionsContainer defs =
807 
		DefinitionsContainer defs =
805 
			Catalog.getInstance().getDefinitionsContainer();
 808 
			Catalog.getInstance().getDefinitionsContainer();
806
809
- 
 
 810 
		Utils.logger.info("slideDef.getID=" + slideDef.getID());
- 
 
 811
807 
		List<FeatureDefinition> featureDefs =
812 
		List<FeatureDefinition> featureDefs =
808 
			defs.getFeatureDefinitions(slideDef.getID());
 813 
			defs.getFeatureDefinitions(slideDef.getID());
809 
		Utils.logger.info("featureDefs=" + featureDefs);
 814 
		Utils.logger.info("featureDefs=" + featureDefs);
810
815
811 
		List<String> validFeatureLabels = new ArrayList<String>();
 816 
		List<String> validFeatureLabels = new ArrayList<String>();
Line 881... Line 886...
881 
		// 1 Retrieve meta-data
 886 
		// 1 Retrieve meta-data
882 
		// 1.1 Retrieve all valid slide names in the content model
 887 
		// 1.1 Retrieve all valid slide names in the content model
883 
		DefinitionsContainer defs =
888 
		DefinitionsContainer defs =
884 
			Catalog.getInstance().getDefinitionsContainer();
 889 
			Catalog.getInstance().getDefinitionsContainer();
885
890
886 
		Map<Long, SlideDefinition> slideDefs = defs.getSlideDefinitions();
 891 
		List<SlideDefinition> slideDefs = defs.getSlideDefinitions(
887 
		Iterator<SlideDefinition> itSlideDefs = slideDefs.values().iterator();
 892 
				this.categoryID);
888
893
889 
		List<String> validSlideNames = new ArrayList<String>();
 894 
		List<String> validSlideNames = new ArrayList<String>();
890 
		while(itSlideDefs.hasNext()) {
 - 
 
891 
			SlideDefinition slideDef = itSlideDefs.next();
 895 
		for (SlideDefinition slideDef : slideDefs) {
892
896
893 
			// To avoid Introduction slide
 897 
			// To avoid Introduction slide
894 
			if(!slideDef.getLabel().isEmpty()) {
 898 
			if(!slideDef.getLabel().isEmpty()) {
895 
				validSlideNames.add(StringUtils.lowerCase(slideDef.getLabel()));
 899 
				validSlideNames.add(StringUtils.lowerCase(slideDef.getLabel()));
896 
			}
 900 
			}