Author: jflesch
Date: 2007-06-23 15:58:14 +0000 (Sat, 23 Jun 2007)
New Revision: 13734
Modified:
trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
Log:
Fix folder deletion
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-06-23
15:51:16 UTC (rev 13733)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-06-23
15:58:14 UTC (rev 13734)
@@ -702,9 +702,29 @@
synchronized(db.dbLock) {
try {
- /* we remove all the files */
PreparedStatement st;
+ /* we remove all the comments */
+
+ st =
db.getConnection().prepareStatement("DELETE FROM indexCommentKeys "+
+ "WHERE
indexCommentKeys.indexId IN "+
+ "
(SELECT indexParents.indexId "+
+ "
FROM indexParents "+
+ "
WHERE indexParents.folderId = ?)");
+ st =
db.getConnection().prepareStatement("DELETE FROM indexComments "+
+ "WHERE
indexComments.indexId IN "+
+ "
(SELECT indexParents.indexId "+
+ "
FROM indexParents "+
+ "
WHERE indexParents.folderId = ?)");
+ st =
db.getConnection().prepareStatement("DELETE FROM indexCommentBlackList "+
+ "WHERE
indexCommentBlackList.indexId IN "+
+ "
(SELECT indexParents.indexId "+
+ "
FROM indexParents "+
+ "
WHERE indexParents.folderId = ?)");
+
+
+ /* we remove all the files */
+
st =
db.getConnection().prepareStatement("DELETE FROM files WHERE files.indexParent
IN "+
"(SELECT indexParents.indexId FROM indexParents WHERE indexParents.folderId =
?)");
