Subversion Repositories SmartDukaan

Rev

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

Rev 70 Rev 71
Line 822... Line 822...
822
		
822
		
823
		// De-serialize
823
		// De-serialize
824
		if(this.cmpSlideRuleDefinitions == null) {
824
		if(this.cmpSlideRuleDefinitions == null) {
825
			String dbFile = Utils.DEFINITIONS_DB_PATH +	
825
			String dbFile = Utils.DEFINITIONS_DB_PATH +	
826
				"comparisondefinitions.ser";
826
				"comparisondefinitions.ser";
-
 
827
			Utils.info("dbFile=" + dbFile);
827
			
828
			
828
			this.cmpSlideRuleDefinitions = 
829
			this.cmpSlideRuleDefinitions = 
829
				(Map<Long, CMPSlideRuleDefinition>) DBUtils.read(dbFile);
830
				(Map<Long, CMPSlideRuleDefinition>) DBUtils.read(dbFile);
-
 
831
			
-
 
832
			//Utils.info("this.cmpSlideRuleDefinitions=" +
-
 
833
			//		this.cmpSlideRuleDefinitions);
830
		}
834
		}
831
		
835
		
832
		return this.cmpSlideRuleDefinitions;
836
		return this.cmpSlideRuleDefinitions;
833
	}
837
	}
834
	
838
	
Line 858... Line 862...
858
	 * @throws Exception
862
	 * @throws Exception
859
	 */
863
	 */
860
	public ExpandedCMPSlideRuleDefinition
864
	public ExpandedCMPSlideRuleDefinition
861
		getExpandedComparisonSlideRuleDefinition(long slideDefinitionID) 
865
		getExpandedComparisonSlideRuleDefinition(long slideDefinitionID) 
862
		throws Exception {
866
		throws Exception {
-
 
867
		Utils.info("slideDefinitionID=" + slideDefinitionID);
863
		
868
		
864
		CMPSlideRuleDefinition cmpSlideRuleDef = 
869
		CMPSlideRuleDefinition cmpSlideRuleDef = 
865
			this.getComparisonSlideRuleDefinition(slideDefinitionID);
870
			this.getComparisonSlideRuleDefinition(slideDefinitionID);
866
		
871
		
-
 
872
		if(cmpSlideRuleDef == null) {
-
 
873
			return null;
-
 
874
		}
-
 
875
		
867
		ExpandedCMPSlideRuleDefinition expDef = 
876
		ExpandedCMPSlideRuleDefinition expDef = 
868
			new ExpandedCMPSlideRuleDefinition(cmpSlideRuleDef);
877
			new ExpandedCMPSlideRuleDefinition(cmpSlideRuleDef);
869
		
878
		
870
		return expDef;
879
		return expDef;
871
	}
880
	}