Subversion Repositories SmartDukaan

Rev

Rev 1362 | Rev 2655 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1362 Rev 1936
Line 28... Line 28...
28
                bulletsstruct = []
28
                bulletsstruct = []
29
                expbullets = expfeature.getExpandedBullets()
29
                expbullets = expfeature.getExpandedBullets()
30
                for expbullet in expbullets :
30
                for expbullet in expbullets :
31
                    if expbullet.isComposite() :
31
                    if expbullet.isComposite() :
32
                        primitivedataobjects = expbullet.getDataObject().getPrimitiveDataObjects()
32
                        primitivedataobjects = expbullet.getDataObject().getPrimitiveDataObjects()
-
 
33
                        unit = expbullet.getUnit()
33
                        for primitivedataobject in primitivedataobjects :
34
                        for primitivedataobject in primitivedataobjects :
34
                            bulletvalue = primitivedataobject.getValue()
35
                            bulletvalue = primitivedataobject.getValue()
-
 
36
                            print "unit is" + `unit`
-
 
37
                            if unit is not None:
-
 
38
                                print "unit is not none"
-
 
39
                                if unit.getShortForm() == "GB":
-
 
40
                                    print "GB is" + `bulletvalue`
-
 
41
                                    #if(bulletvalue.endswith('L')):
-
 
42
                                    #    bulletvalue=bulletvalue[0:len(bulletvalue)-2]
-
 
43
                                    #bulletvalue = bulletvalue * 1024 * 1024
-
 
44
                                    #print "KB is" + `bulletvalue`
-
 
45
                                    #convert to kb
-
 
46
                                if unit.getShortForm() == "MB":
-
 
47
                                    print "GB is" + `bulletvalue`
-
 
48
                                    #if(bulletvalue.endswith('L')):
-
 
49
                                    #    bulletvalue=bulletvalue[0:len(bulletvalue)-2]
-
 
50
                                    #bulletvalue = bulletvalue * 1024
-
 
51
                                    #print "KB is" + `bulletvalue`
-
 
52
                                    #convert to kb
-
 
53
                            
35
                            #print "bulletvalue=" + bulletvalue
54
                            #print "bulletvalue=" + bulletvalue
36
                            bulletsstruct.append(bulletvalue)
55
                            bulletsstruct.append(bulletvalue)
37
                         
56
                         
38
                    elif expbullet.isEnumerated() :
57
                    elif expbullet.isEnumerated() :
39
                        bulletvalue = expbullet.getExpandedEnumDataObject().getEnumValue().getValue()
58
                        bulletvalue = expbullet.getExpandedEnumDataObject().getEnumValue().getValue()
Line 41... Line 60...
41
                        bulletsstruct.append(bulletvalue)
60
                        bulletsstruct.append(bulletvalue)
42
                    
61
                    
43
                    else :
62
                    else :
44
                        bulletvalue = expbullet.getDataObject().getValue()
63
                        bulletvalue = expbullet.getDataObject().getValue()
45
                        #print "bulletvalue=" + bulletvalue
64
                        #print "bulletvalue=" + bulletvalue
-
 
65
                        unit = expbullet.getUnit()
-
 
66
                        print "unit is" + `unit`
-
 
67
                        if unit is not None:
-
 
68
                            print "unit is not none"
-
 
69
                            if unit.getShortForm() == "GB":
-
 
70
                                print "GB is" + `bulletvalue`
-
 
71
                                value = float(bulletvalue)
-
 
72
                                #if(bulletvalue.endswith('L')):
-
 
73
                                 #   bulletvalue=bulletvalue[0:len(bulletvalue)-2]
-
 
74
                                newvalue = value * 1024 * 1024
-
 
75
                                print "KB is" + `newvalue`
-
 
76
                                bulletvalue = str(newvalue)
-
 
77
                                #convert to kb
-
 
78
                            if unit.getShortForm() == "MB":
-
 
79
                                print "MB is" + `bulletvalue`
-
 
80
                                value = float(bulletvalue)
-
 
81
                                #if(bulletvalue.endswith('L')):
-
 
82
                                    #bulletvalue=bulletvalue[0:len(bulletvalue)-2]
-
 
83
                                newvalue = value * 1024
-
 
84
                                print "KB is" + `newvalue`
-
 
85
                                bulletvalue = str(newvalue)
-
 
86
                                #convert to kb
46
                        bulletsstruct.append(bulletvalue)
87
                        bulletsstruct.append(bulletvalue)
47
                        
88
                        
48
                featurestructs[featurelabel] = bulletsstruct
89
                featurestructs[featurelabel] = bulletsstruct
49
            else :
90
            else :
50
                # Set to empty list, this is to accomodate bullet-less features
91
                # Set to empty list, this is to accomodate bullet-less features