Bug Fixing

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174293 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/dao/CategoryDAO.java

@@ -61,7 +61,7 @@ public class CategoryDAO
 																				+ " FROM ECMSubCategory esc, SiteItem si "
 																				+ " WHERE esc.scatCode = si.scatCode  "
 																				+ " AND si.siteCode = :siteCode "
-																				+ " AND si.ecmType = 1 "
+																				+ " AND si.ecmType IN (1, 2, 3)"
 																				+ " )"
 																				+ " ORDER BY catCode ");
 			query.setParameter("siteCode", siteCode);
@@ -78,7 +78,7 @@ public class CategoryDAO
 																		+ " FROM SiteItem si "
 																		+ " WHERE si.scatCode = ec.catCode "
 																		+ " AND si.siteCode = :siteCode "
-																		+ " AND si.ecmType = 1 "
+																		+ " AND si.ecmType IN (1, 2, 3) "
 																		+ " )"
 																		+ " ORDER BY ec.catCode ");
 			query.setParameter("siteCode", siteCode);
@@ -169,7 +169,7 @@ public class CategoryDAO
 			Query query = session.createQuery("FROM ECMSubCategory WHERE scatCode IN ("
 																					+ " SELECT scatCode FROM SiteItem "
 																					+ " WHERE siteCode = :siteCode "
-																					+ " AND ecmType = 1 "
+																					+ " AND ecmType IN (1, 2, 3) "
 																					+ ")"
 																					+ " ORDER BY catCode, scatCode ");
 			query.setParameter("siteCode", siteCode);
@@ -204,7 +204,7 @@ public class CategoryDAO
 			Query query = session.createQuery("FROM ItemMaster WHERE item_code IN ("
 																					+ " SELECT itemCode FROM SiteItem "
 																					+ " WHERE siteCode = :siteCode "
-																					+ " AND ecmType = 1 "
+																					+ " AND ecmType IN (1, 2, 3) "
 																					+ ")"
 																					+ " ORDER BY item_code ");
 			query.setParameter("siteCode", siteCode);
@@ -240,7 +240,7 @@ public class CategoryDAO
 																					+ " SELECT itemCode FROM SiteItem "
 																					+ " WHERE siteCode = :siteCode "
 																					+ " AND scatCode = :scatCode "
-																					+ " AND ecmType = 1 "
+																					+ " AND ecmType IN (1, 2, 3) "
 																					+ ")"
 																					+ " ORDER BY item_code ");
 			query.setParameter("siteCode", siteCode);
@@ -276,7 +276,7 @@ public class CategoryDAO
 											+ " AND si.itemCode = item.item_code "
 											+ " AND esc.curRank < :curRank "
 											+ " AND si.siteCode = :siteCode "
-											+ " AND si.ecmType = 1 "
+											+ " AND si.ecmType IN (1, 2, 3) "
 											+ " ORDER BY item.item_code ");
 			
 			query.setParameter("siteCode", siteCode);

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/dao/ProductDAO.java

@@ -421,14 +421,14 @@ public class ProductDAO {
 			List<ItemAttribute> itemAttributesList = query.getResultList();
 			System.out.println("fetchAttributes for phyAttrib ["+phyAttrib+"]");
 			
-			ItemAttribute itemAttributeObj = ( itemAttributesList != null ) ? itemAttributesList.get(0) : null;
+			ItemAttribute itemAttributeObj = ( itemAttributesList != null && !itemAttributesList.isEmpty() ) ? itemAttributesList.get(0) : null;
 			if(itemAttributeObj != null)
 			{
 				Query query1 = session.createQuery("FROM ItemAttributeVal WHERE attribCode = '" + phyAttrib + "'");
 				List<ItemAttributeVal> attributeList = query1.getResultList();
 				productCache.storeItemAttribValues(cacheName, attributeList);
-			}
 				productCache.storeItemAttribs(cacheName, itemAttributeObj);
+			}
 			session.close();
 		} 
 		catch (HibernateException e) 

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/schedule/StartUp.java

 package proteus.ecm.schedule;
 
 import java.util.Date;
-import java.util.List;
 
 import proteus.ecm.cache.CacheManager;
 import proteus.ecm.cache.dao.SystemCache;

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/service/CategoryService.java

@@ -223,8 +223,20 @@ public class CategoryService
 				//For Facet Data Creation
 				if( optionObjArr == null )
 				{
+					String facetDataStr = null;
 					ECMSubCategory ecmSubCategory = categoryCache.getCachedSubCategory(scatCode, cacheName);
-					String facetDataStr = getFacetData(scatCode, "local2do", ecmSubCategory.getKeyAttrib() );
+					if( ecmSubCategory == null  )
+					{
+						ECMCategory ecmCategory = categoryCache.getCachedCategory(scatCode, cacheName);
+						facetDataStr = getFacetData(scatCode, "local2do", ecmCategory.getKeyAttrib() );
+					}
+					else
+					{
+						facetDataStr = getFacetData(scatCode, "local2do", ecmSubCategory.getKeyAttrib() );
+					}
+					
+					if( facetDataStr != null && !"false".equalsIgnoreCase( facetDataStr ))
+					{
 						JSONObject facetData = new JSONObject(facetDataStr);
 						System.out.println("JSONObject facetData [" + facetData + "]");
 						JSONObject facetFields = facetData.getJSONObject("facet_counts").getJSONObject("facet_fields");
@@ -256,8 +268,17 @@ public class CategoryService
 						}
 					}
 				}
+			}
+			//itemDetails.put(new JSONObject().put("filterOptions", optionObjArr));
+			if( optionObjArr != null )
+			{
 				itemDetails.put(new JSONObject().put("filterOptions", optionObjArr));
 			}
+			else
+			{
+				itemDetails.put(new JSONObject().put("filterOptions", new JSONArray()));
+			}
+		}
 		//return itemDetails;
 		return Response.status(200).entity(itemDetails.toString()).build();
 	}
@@ -551,11 +572,12 @@ public class CategoryService
 				solrQuery.setRows(0);
 				
 				List<String> attribList = getAttributeList(keyAttributes);
+				if( attribList != null )
+				{
 					String[] attribArr = {};
 					solrQuery.addFacetField( attribList.toArray( attribArr) );
-				
 					System.out.println("keyAttributes: [\n"+keyAttributes + "]" + attribList + "<attribList>" + attribArr);
-				
+				}
 				System.out.println("solrURL["+solrURL+"]");
 				String urlQueryString = ClientUtils.toQueryString(solrQuery, true);	
 				System.out.println("urlQueryString: [\n"+urlQueryString);