[Cayambe-development] CVS: core/src/org/cayambe/dao CategoryDAO.java,1.15,1.16 ProductDAO.java,1.23,
Status: Pre-Alpha
Brought to you by:
jlward4
Menu
▾
▴
[Cayambe-development] CVS: core/src/org/cayambe/dao CategoryDAO.java,1.15,1.16 ProductDAO.java,1.23,1.24
|
From: Jon R. <jon...@us...> - 2002-05-22 20:45:44
|
Update of /cvsroot/cayambe/core/src/org/cayambe/dao
In directory usw-pr-cvs1:/tmp/cvs-serv8240/src/org/cayambe/dao
Modified Files:
CategoryDAO.java ProductDAO.java
Log Message:
Fixed problems with admin. Made VO's Serializable. Debug linkage error. Jboss needs mysql.jar in classpath at startup.
Index: CategoryDAO.java
===================================================================
RCS file: /cvsroot/cayambe/core/src/org/cayambe/dao/CategoryDAO.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CategoryDAO.java 13 May 2002 18:55:13 -0000 1.15
--- CategoryDAO.java 22 May 2002 20:45:41 -0000 1.16
***************
*** 52,76 ****
sqlString.append(c.getHeader());
sqlString.append("','");
! if (c.isSelected()) {
sqlString.append("1");
! } else {
sqlString.append("0");
! }
sqlString.append("','");
sqlString.append(c.getImagePath());
sqlString.append("')");
! sqlString2.append("insert into category_category (category_id,parent_id)");
! sqlString2.append(" values (");
! sqlString2.append("LAST_INSERT_Id()");
! sqlString2.append(",'");
! sqlString2.append(c.getParentId());
! sqlString2.append("')");
} else {
sqlString.append("update category set name = '");
sqlString.append(c.getName());
! sqlString.append("', header = '");
sqlString.append(c.getHeader());
! sqlString.append("', visible = '");
if (c.isSelected()) {
sqlString.append("1");
--- 52,76 ----
sqlString.append(c.getHeader());
sqlString.append("','");
! if (c.isSelected()) {
sqlString.append("1");
! } else {
sqlString.append("0");
! }
sqlString.append("','");
sqlString.append(c.getImagePath());
sqlString.append("')");
! sqlString2.append("insert into category_category (category_id,parent_id)");
! sqlString2.append(" values (");
! sqlString2.append("LAST_INSERT_Id()");
! sqlString2.append(",'");
! sqlString2.append(c.getParentId());
! sqlString2.append("')");
} else {
sqlString.append("update category set name = '");
sqlString.append(c.getName());
! sqlString.append("', header = '");
sqlString.append(c.getHeader());
! sqlString.append("', visible = '");
if (c.isSelected()) {
sqlString.append("1");
***************
*** 78,82 ****
sqlString.append("0");
}
! sqlString.append("', image = '");
sqlString.append(c.getImagePath());
sqlString.append("' where category_id = '");
--- 78,82 ----
sqlString.append("0");
}
! sqlString.append("', image = '");
sqlString.append(c.getImagePath());
sqlString.append("' where category_id = '");
***************
*** 94,98 ****
--- 94,100 ----
stmt = conn.createStatement();
+ cat.debug("About run first stmt.");
stmt.executeUpdate(sqlString.toString());
+ cat.debug("first stmt executed successfully");
stmt.executeUpdate(sqlString2.toString());
stmt.close();
***************
*** 102,106 ****
} catch (Exception e) {
cat.info(e.getMessage());
! } finally {
try {
if (conn != null) conn.close();
--- 104,108 ----
} catch (Exception e) {
cat.info(e.getMessage());
! } finally {
try {
if (conn != null) conn.close();
Index: ProductDAO.java
===================================================================
RCS file: /cvsroot/cayambe/core/src/org/cayambe/dao/ProductDAO.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ProductDAO.java 16 May 2002 23:14:19 -0000 1.23
--- ProductDAO.java 22 May 2002 20:45:41 -0000 1.24
***************
*** 59,70 ****
sqlString.append("0");
}
! sqlString.append("','");
! if (p.isVisible()) {
sqlString.append("1");
! } else {
sqlString.append("0");
! }
! sqlString.append("')");
! } else {
sqlString.append("update product set title = '");
sqlString.append(p.getTitle());
--- 59,70 ----
sqlString.append("0");
}
! sqlString.append("','");
! if (p.isVisible()) {
sqlString.append("1");
! } else {
sqlString.append("0");
! }
! sqlString.append("')");
! } else {
sqlString.append("update product set title = '");
sqlString.append(p.getTitle());
***************
*** 230,244 ****
public Collection SearchProduct(ProductVO p)
{
StringBuffer sqlString = new StringBuffer(255);
sqlString.append("select * from product ");
sqlString.append("where ");
sqlString.append("upper(product.title) like upper('%");
! sqlString.append(p.getTitle());
sqlString.append("%')");
sqlString.append(" or upper(product.description) like upper('%");
! sqlString.append(p.getDesc());
sqlString.append("%')");
sqlString.append(" or upper(product.SKU) like upper('%");
! sqlString.append(p.getSKU());
sqlString.append("%')");
--- 230,262 ----
public Collection SearchProduct(ProductVO p)
{
+ String title = p.getTitle();
+ String SKU = p.getSKU();
+ String desc = p.getDesc();
+ if (p.getTitle() == null || p.getTitle().length() <= 0)
+ {
+ title = "NULL";
+ }
+
+ if (p.getSKU() == null || p.getSKU().length() <= 0)
+ {
+ SKU = "NULL";
+ }
+
+ if (p.getDesc() == null || p.getDesc().length() <= 0)
+ {
+ desc = null;
+ }
+
StringBuffer sqlString = new StringBuffer(255);
sqlString.append("select * from product ");
sqlString.append("where ");
sqlString.append("upper(product.title) like upper('%");
! sqlString.append(title);
sqlString.append("%')");
sqlString.append(" or upper(product.description) like upper('%");
! sqlString.append(desc);
sqlString.append("%')");
sqlString.append(" or upper(product.SKU) like upper('%");
! sqlString.append(SKU);
sqlString.append("%')");
***************
*** 246,308 ****
}
- public Collection SearchProductNotInCategory(CategoryVO c)
- {
-
- StringBuffer sqlString = new StringBuffer(255);
-
- ArrayList listTemp = new ArrayList();
- ArrayList list = null;
- Statement stmt = null;
- ResultSet rs = null;
- Connection conn = null;
-
- String tempSQL = "select category_id, product_id from product_category where category_id = " + c.getId();
-
- try {
-
- CayambeServiceLocator serviceLocator = CayambeServiceLocator.getInstance();
- DataSource ds = (DataSource)serviceLocator.getDatasource();
- conn = ds.getConnection();
-
- cat.debug("---> " + tempSQL);
- stmt = conn.createStatement();
- rs = stmt.executeQuery(tempSQL);
- while (rs.next()) {
- String ids = "insert into temp_product_category (category_id,product_id) values (" + rs.getString("category_id") + "," + rs.getString("product_id") + ")";
- listTemp.add(ids);
- }
- rs.close();
-
- cat.debug("---------->THE SIZE OF THE ARRAYLIST IS: " + listTemp.size());
- for (int i=0; i < listTemp.size(); i++) {
- cat.debug("---> " + listTemp.get(i));
- stmt.executeUpdate((String)listTemp.get(i));
- }
-
- sqlString.append("select distinct(product.product_id), product.* from product ");
- sqlString.append("LEFT JOIN temp_product_category ON product.product_id=temp_product_category.product_id where ");
- sqlString.append("temp_product_category.category_id IS NULL");
- list = (ArrayList)ListProduct(sqlString.toString());
-
- tempSQL = "delete from temp_product_category";
- cat.debug("---> " + tempSQL);
- stmt.executeUpdate(tempSQL);
- stmt.close();
- conn.close();
-
- } catch (Exception e) {
- cat.info(e.getMessage());
- } finally {
- try {
- if (conn != null) conn.close();
- if (stmt != null) stmt.close();
- if (rs != null) rs.close();
- } catch (SQLException ignored) {}
- }
- return list;
- }
-
-
-
public Collection ListProduct(String sqlString)
--- 264,267 ----
***************
*** 316,320 ****
try {
! cat.info(sqlString);
CayambeServiceLocator serviceLocator = CayambeServiceLocator.getInstance();
--- 275,279 ----
try {
! cat.info("LISTPRODUCT SQLSTRING ------>" + sqlString);
CayambeServiceLocator serviceLocator = CayambeServiceLocator.getInstance();
***************
*** 365,367 ****
}
! }
--- 324,326 ----
}
! }
\ No newline at end of file
|
