Subversion Repositories SmartDukaan

Rev

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

Rev 450 Rev 480
Line 1... Line 1...
1 
package in.shop2020.creation.controllers;
 1 
package in.shop2020.creation.controllers;
2 
 
 2 
 
3 
import in.shop2020.creation.util.ContentValidator;
 3 
import in.shop2020.creation.util.ContentValidator;
4 
import in.shop2020.creation.util.CreationUtils;
 4 
import in.shop2020.metamodel.util.CreationUtils;
5 
import in.shop2020.metamodel.core.Bullet;
 5 
import in.shop2020.metamodel.core.Bullet;
6 
import in.shop2020.metamodel.core.CompositeDataObject;
 6 
import in.shop2020.metamodel.core.CompositeDataObject;
7 
import in.shop2020.metamodel.core.Entity;
 7 
import in.shop2020.metamodel.core.Entity;
8 
import in.shop2020.metamodel.core.EnumDataObject;
 8 
import in.shop2020.metamodel.core.EnumDataObject;
9 
import in.shop2020.metamodel.core.Feature;
 9 
import in.shop2020.metamodel.core.Feature;
Line 18... Line 18...
18 
import in.shop2020.metamodel.definitions.EditorialImportance;
 18 
import in.shop2020.metamodel.definitions.EditorialImportance;
19 
import in.shop2020.metamodel.definitions.EntityContainer;
 19 
import in.shop2020.metamodel.definitions.EntityContainer;
20 
import in.shop2020.metamodel.definitions.FeatureDefinition;
 20 
import in.shop2020.metamodel.definitions.FeatureDefinition;
21 
import in.shop2020.metamodel.definitions.SlideDefinition;
 21 
import in.shop2020.metamodel.definitions.SlideDefinition;
22 
import in.shop2020.metamodel.definitions.SlideFeatureDefinition;
 22 
import in.shop2020.metamodel.definitions.SlideFeatureDefinition;
- 
 
 23 
import in.shop2020.metamodel.util.CN;
23 
import in.shop2020.metamodel.util.ExpandedBullet;
 24 
import in.shop2020.metamodel.util.ExpandedBullet;
24 
import in.shop2020.metamodel.util.ExpandedBulletDefinition;
 25 
import in.shop2020.metamodel.util.ExpandedBulletDefinition;
25 
import in.shop2020.metamodel.util.ExpandedEntity;
 26 
import in.shop2020.metamodel.util.ExpandedEntity;
26 
import in.shop2020.metamodel.util.ExpandedFeature;
 27 
import in.shop2020.metamodel.util.ExpandedFeature;
27 
import in.shop2020.metamodel.util.ExpandedFeatureDefinition;
 28 
import in.shop2020.metamodel.util.ExpandedFeatureDefinition;
Line 775... Line 776...
775 
			if(isBlank) {
 776 
			if(isBlank) {
776
777
777 
				// Mandatory
 778 
				// Mandatory
778 
				// or optional/recommended but allows blanck and not skipped
 779 
				// or optional/recommended but allows blanck and not skipped
779 
				if(slideFeatureDef.getEditorialImportance() ==
780 
				if(slideFeatureDef.getEditorialImportance() ==
780 
					EditorialImportance.MANDATORY || expFeatureDef.allowsBlank()) {
781 
					EditorialImportance.MANDATORY || expFeatureDef.allowsBlank()) {
- 
 
 782 
					// FFC
- 
 
 783 
					FreeformContent featureFFC =
- 
 
 784 
						this.getFreeformContent(featureDefIDString);
- 
 
 785
- 
 
 786 
					feature.setFreeformContent(featureFFC);
- 
 
 787
781 
					features.add(feature);
 788 
					features.add(feature);
782 
				}
 789 
				}
783
790
784 
				continue;
 791 
				continue;
785 
			}
 792 
			}
Line 920... Line 927...
920 
	    	CreationUtils.deleteFromIncomplete(entity);
 927 
	    	CreationUtils.deleteFromIncomplete(entity);
921
928
922 
	    	CreationUtils.deleteEntity(entityID);
 929 
	    	CreationUtils.deleteEntity(entityID);
923
930
924 
	    	CreationUtils.rewriteRepository(entities, entitiesbycat);
 931 
	    	CreationUtils.rewriteRepository(entities, entitiesbycat);
- 
 
 932 
			// Added automatic learning once someone rewrites repository
- 
 
 933 
			CN cn = new CN();
- 
 
 934 
			cn.learn();
925 
		} catch (Exception e) {
 935 
		} catch (Exception e) {
926 
			log.error(CreationUtils.getStackTrace(e));
 936 
			log.error(CreationUtils.getStackTrace(e));
927 
			this.setErrorString(CreationUtils.getStackTrace(e));
 937 
			this.setErrorString(CreationUtils.getStackTrace(e));
928 
			return "fatal";
 938 
			return "fatal";
929 
		}
 939 
		}
Line 1254... Line 1264...
1254 
		// Add to repository only if validations succeed
 1264 
		// Add to repository only if validations succeed
1255 
		else {
 1265 
		else {
1256 
			CreationUtils.deleteFromIncomplete(entity);
 1266 
			CreationUtils.deleteFromIncomplete(entity);
1257
1267
1258 
			this.updateRepository();
 1268 
			this.updateRepository();
- 
 
 1269 
			// Added automatic learning once someone rewrites repository
- 
 
 1270 
			CN cn = new CN();
- 
 
 1271 
			cn.learn();
1259 
		}
 1272 
		}
1260 
	}
 1273 
	}
1261 
 
 1274 
 
1262 
    /**
 1275 
    /**
1263 
     *
1276 
     *
Line 1277... Line 1290...
1277 
		}
 1290 
		}
1278 
		else {
 1291 
		else {
1279 
			CreationUtils.deleteFromIncomplete(entity);
 1292 
			CreationUtils.deleteFromIncomplete(entity);
1280
1293
1281 
			entContainer.updateEntity(entity);
 1294 
			entContainer.updateEntity(entity);
- 
 
 1295
- 
 
 1296 
 
1282 
		}
 1297 
		}
1283
1298
1284 
		CreationUtils.storeEntity(entity);
 1299 
		CreationUtils.storeEntity(entity);
1285
1300
1286 
		this.updateRepository();
 1301 
		this.updateRepository();
- 
 
 1302
- 
 
 1303 
		if(validator.validate(entity)) {
- 
 
 1304 
			// Added automatic learning once someone rewrites repository
- 
 
 1305 
			CN cn = new CN();
- 
 
 1306 
			cn.learn();
- 
 
 1307 
		}
1287 
	}
 1308 
	}
1288 
 
 1309 
 
- 
 
 1310
- 
 
 1311
1289 
	/**
 1312 
	/**
1290 
	 *
1313 
	 *
1291 
	 * @throws Exception
 1314 
	 * @throws Exception
1292 
	 */
 1315 
	 */
1293 
	private void updateRepository() throws Exception {
1316 
	private void updateRepository() throws Exception {