WebSVN – SmartDukaan – Diff – /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java

             props.put("entityUrl", entityUrl);
             props.put("title", title);
             props.put("name", EntityUtils.getProductName(expEntity));
             boolean displayAccessories;
-            Category parentCategory = expEntity.getCategory().getParentCategory();
+            Category parentCategory = category.getParentCategory();
             props.put("parentCategory", parentCategory.getLabel());
             if(parentCategory.isHasAccessories()){
                 props.put("displayAccessories", "TRUE");
                 displayAccessories = true;
             }else{
                 props.put("displayAccessories", "FALSE" );
                 displayAccessories = false;
+            }
             props.put("categoryName", categoryName);
+            props.put("compareCategory", parentCategory.isComparable() ? parentCategory.getLabel() : categoryName);
             props.put("categoryUrl", categoryName.replaceAll(SPACE, "-").toLowerCase() + "/" + category.getID());
             String categoryUrl = categoryName.replaceAll(SPACE, "-").toLowerCase() + "/" + category.getID();
             String brandUrl = expEntity.getBrand().toLowerCase().replace(' ', '-');
         		+ "\n");
         Map<Long, Double> slideScores = CreationUtils
                 .getSlideComparisonScores(catalogId);
+        DecimalFormat oneDForm = new DecimalFormat("#.#");
         for (ExpandedSlide expSlide : expEntity.getExpandedSlides()) {
             if (expSlide.getSlideDefinitionID() == Utils.SUMMARY_SLIDE_DEFINITION_ID
                     || expSlide.getSlideDefinitionID() == Utils.AFTER_SALES_SLIDE_DEFINITION_ID) {
                 continue;
+            }
             slideNames.append(expSlide.getSlideDefinition().getLabel() + "!!!");
-            String bucketName = "None";
-            if (Catalog
-                    .getInstance()
-                    .getDefinitionsContainer()
-                    .getComparisonBucketName(expEntity.getCategoryID(),
+            String bucketName = Catalog.getInstance().getDefinitionsContainer().getComparisonBucketName(expEntity.getCategoryID(), expSlide.getSlideDefinitionID());
-                            expSlide.getSlideDefinitionID()) != null) {
-                bucketName = Catalog
+            if ( bucketName == null) {
-                        .getInstance()
+                bucketName = "None";
-                        .getDefinitionsContainer()
-                        .getComparisonBucketName(expEntity.getCategoryID(),
-                                expSlide.getSlideDefinitionID());
+            }
             slideNames.append(bucketName + "!!!");
             double score = 0;
-            if (slideScores.get(expSlide.getSlideDefinitionID()) != null) {
+            if (slideScores != null && slideScores.get(expSlide.getSlideDefinitionID()) != null) {
                 score = slideScores.get(expSlide.getSlideDefinitionID());
+            }
-            DecimalFormat oneDForm = new DecimalFormat("#.#");
             score = Double.valueOf(oneDForm.format(score));
             slideNames.append(score + "\n");
+        }
             prodName = expEntity.getBrand().trim()
                     + SPACE
                     + ((expEntity.getModelName() != null) ? expEntity
                             .getModelName().trim() : "");
+        }
+        Category cat = expEntity.getCategory();
-        Category parentCategory = expEntity.getCategory().getParentCategory();
+        Category parentCategory = cat.getParentCategory();
-        String categoryName = expEntity.getCategory().getLabel();
+        String categoryName = cat.getLabel();
         String tagline = "";
         String warranty = "";
         String tinySnippet = "";
         List<Feature> features = expEntity.getSlide(130054).getFeatures();
         for (Feature feature : features) {
                         warranty += SPACE + HYPHON + SPACE + expBullet.getExpandedEnumDataObject().getEnumValue().getValue();
+                    }
+                }
+            }
+        }
-        long categoryId = expEntity.getCategory().getID();
+        long categoryId = cat.getID();
         params.put("PROD_NAME", prodName);
         params.put("URL", EntityUtils.getEntityURL(expEntity));
         params.put("TITLE", title);
         params.put("BRAND_NAME", brandName);
         params.put("PRODUCT_NAME", productName);
         params.put("CATEGORY_ID", ((int) categoryId) + "");
         params.put("CATEGORY_NAME", categoryName);
-        params.put("PARENT_CATEGORY", expEntity.getCategory().getParentCategory().getLabel());
+        params.put("PARENT_CATEGORY", parentCategory.getLabel());
+        params.put("COMPARE_CATEGORY", parentCategory.isComparable() ?
+        			parentCategory.getLabel(): cat.getLabel());
         params.put("CATEGORY_URL", categoryName.replaceAll(SPACE, HYPHON)
                 .toLowerCase() + "/" + categoryId);
         params.put(
                 "PRODUCT_URL",
                 URLEncoder.encode("http://www.", "UTF-8")
                         + "${domain}"
                         + URLEncoder.encode(
                                 EntityUtils.getEntityURL(expEntity), "UTF-8"));
-        if (parentCategory.isComparable())	{
+        if (cat.isComparable())	{
         	params.put("IS_COMPARABLE", "TRUE");
         } else	{
         	params.put("IS_COMPARABLE", "FALSE");
+        }
+        }
         VelocityContext context = new VelocityContext();
         Category parentCategory = expEntity.getCategory().getParentCategory();
-        Boolean isComparable = parentCategory.isComparable();
+        Boolean isComparable = expEntity.getCategory().isComparable();
         String mediaPrefix = EntityUtils.getMediaPrefix(expEntity);
         context.put("mediaPrefix", mediaPrefix);
         context.put("expentity", expEntity);
         context.put("contentVersion", this.contentVersion);
         context.put("defs", Catalog.getInstance().getDefinitionsContainer());
         filenames.add("WidgetSnippet");
         filenames.add("HomeSnippet");
         filenames.add("SearchSnippet");
         filenames.add("CategorySnippet");
         filenames.add("SlideGuide");
-        filenames.add("MyResearchSnippet");
         filenames.add("AfterSales");
+        filenames.add("CompareProductSnippet");
+        filenames.add("ComparisonSnippet");
+        getSlidenamesSnippet(expEntity, exportPath);
+        filenames.add("MyResearchSnippet");
         if(isComparable){
-        	filenames.add("CompareProductSnippet");
-        	filenames.add("ComparisonSnippet");
         	filenames.add("CompareProductSummarySnippet");
         	filenames.add("MostComparedSnippet");
         	getMostComparedProducts(expEntity, exportPath);
-        	getSlidenamesSnippet(expEntity, exportPath);
+        }
         if(parentCategory.isHasAccessories()){
         	getRelatedAccessories(expEntity, exportPath);
+        }
         if(parentCategory.getID()==Utils.MOBILE_PHONES_CATAGORY){

Subversion Repositories SmartDukaan

(root)/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java – Rev 5763 → 5930