Author: jflesch
Date: 2007-01-26 20:14:14 +0000 (Fri, 26 Jan 2007)
New Revision: 11621
Modified:
trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Fix index keys generation
Modified: trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2007-01-26 19:53:21 UTC
(rev 11620)
+++ trunk/apps/Thaw/src/thaw/core/FreenetURIHelper.java 2007-01-26 20:14:14 UTC
(rev 11621)
@@ -71,7 +71,7 @@
if ((SSK == null) || SSK.startsWith("USK@"))
return SSK;
- SSK.replaceFirst("SSK@", "USK@");
+ SSK = SSK.replaceFirst("SSK@", "USK@");
final String[] split = SSK.split("/");
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-01-26 19:53:21 UTC (rev 11620)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-01-26 20:14:14 UTC (rev 11621)
@@ -197,10 +197,16 @@
/* TODO : Author */
+ String publicKey;
+
+ publicKey =
+
FreenetURIHelper.convertSSKtoUSK(sskGenerator.getPublicKey())
+ +"/"+name+"/0/"+name+".frdx";
+
st.setInt(1, id);
st.setString(2, name);
st.setString(3, name);
- st.setString(4,
sskGenerator.getPublicKey());
+ st.setString(4, publicKey);
st.setString(5,
sskGenerator.getPrivateKey());
st.setNull(6, Types.VARCHAR);
st.setInt(7, 0 /* positionInTree */);
@@ -499,7 +505,7 @@
public static Index addIndex(final FCPQueueManager queueManager, final
IndexBrowserPanel indexBrowser, final IndexFolder target, final String
publicKey) {
- return IndexManagementHelper.reuseIndex(queueManager,
indexBrowser, target, publicKey, null);
+ return IndexManagementHelper.reuseIndex(queueManager,
indexBrowser, target, publicKey, null, false);
}
public static Index reuseIndex(final FCPQueueManager queueManager,
final IndexBrowserPanel indexBrowser, final IndexFolder target, String
publicKey, String privateKey) {
