Author: jflesch
Date: 2007-03-14 08:10:00 +0000 (Wed, 14 Mar 2007)
New Revision: 12112
Modified:
trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
Log:
Fix key comparaison function
Modified: trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2007-03-14 07:57:03 UTC
(rev 12111)
+++ trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2007-03-14 08:10:00 UTC
(rev 12112)
@@ -256,23 +256,20 @@
/**
* will lower the case !
+ * compare only with another result from this function
*/
public static String getComparablePart(String key) {
if (key == null)
return null;
- /* TODO : Being able to compare an USK with a negative rev
- * with an USK with a positive rev
- */
-
- if (key.startsWith("CHK@")) {
- if (key.length() <= 70)
- return key.toLowerCase();
-
- return key.substring(0, 70).toLowerCase();
+ if (key.startsWith("KSK@")) {
+ return key;
}
- return key;
+ if (key.length() <= 70)
+ return key.toLowerCase();
+
+ return key.substring(0, 70).toLowerCase();
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-03-14 07:57:03 UTC
(rev 12111)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-03-14 08:10:00 UTC
(rev 12112)
@@ -1225,8 +1225,8 @@
PreparedStatement st;
st =
db.getConnection().prepareStatement("DELETE FROM links "+
-
"WHERE toDelete = TRUE "+
-
"AND indexParent = ?");
+
"WHERE toDelete = TRUE "+
+
"AND indexParent = ?");
st.setInt(1, id);
st.execute();
} catch(SQLException exc) {
