Author: jflesch
Date: 2007-01-26 22:47:54 +0000 (Fri, 26 Jan 2007)
New Revision: 11623
Modified:
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/Link.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
Log:
Fix search functions
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-01-26 20:48:26 UTC
(rev 11622)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-01-26 22:47:54 UTC
(rev 11623)
@@ -158,7 +158,7 @@
thaw.plugin.fetch.freenet0.5.l6=the Thaw developper.
-thaw.plugin.console.console=Console
+thaw.plugin.console.console=Log console
thaw.plugin.console.saveToFile=Save log to file
thaw.plugin.console.maxSize=Maximum memory allocated to store log (in Bytes)
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-01-26 20:48:26 UTC
(rev 11622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-01-26 22:47:54 UTC
(rev 11623)
@@ -785,7 +785,7 @@
ResultSet res = st.executeQuery();
while(res.next()) {
- Link l = new Link(db, res.getInt("id"),
res.getString("publicKey"), id);
+ Link l = new Link(db, res.getInt("id"),
res.getString("publicKey"), this);
links.add(l);
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Link.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Link.java 2007-01-26 20:48:26 UTC
(rev 11622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Link.java 2007-01-26 22:47:54 UTC
(rev 11623)
@@ -19,6 +19,7 @@
private String publicKey;
private int parentId;
+ private Index parent = null;
public Link(final Hsqldb hsqldb, final int id) {
this.id = id;
@@ -27,6 +28,7 @@
reloadDataFromDb(id);
}
+
public Link(final Hsqldb hsqldb, final int id, String publicKey,
int parentId) {
this.id = id;
@@ -35,6 +37,16 @@
this.parentId = parentId;
}
+
+ public Link(final Hsqldb hsqldb, final int id, String publicKey,
+ Index parent) {
+ this.id = id;
+ this.db = hsqldb;
+ this.publicKey = publicKey;
+ this.parentId = parent.getId();
+ this.parent = parent;
+ }
+
public void reloadDataFromDb(int id) {
this.id = id;
@@ -121,7 +133,23 @@
}
}
+ /**
+ * @return the parent index in the tree if known, else null
+ */
+ public Index getTreeParent() {
+ if (parent != null)
+ return parent;
+
+ return null;
+ }
+
+ /**
+ * @return the parent index ; build a new one with its id if needed
+ */
public Index getParent() {
+ if (parent != null)
+ return parent;
+
int parentId;
parentId = getParentId();
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
2007-01-26 20:48:26 UTC (rev 11622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
2007-01-26 22:47:54 UTC (rev 11623)
@@ -78,14 +78,18 @@
private AbstractButton src;
private Vector t;
+ private boolean addToParent; /* (== add to the same parent
folder) */
+
public IndexAdder(final AbstractButton actionSource,
final FCPQueueManager queueManager,
- final IndexBrowserPanel indexBrowser) {
+ final IndexBrowserPanel indexBrowser,
+ boolean addToParent) {
src = actionSource;
if (actionSource != null)
actionSource.addActionListener(this);
this.queueManager = queueManager;
this.indexBrowser = indexBrowser;
+ this.addToParent = addToParent;
}
public void setTarget(final Vector targets) {
@@ -104,8 +108,10 @@
it.hasNext(); ) {
final Link link = (Link)it.next();
if (link != null) {
-
IndexManagementHelper.addIndex(queueManager, indexBrowser, null,
-
link.getPublicKey());
+ if (addToParent && link.getTreeParent()
!= null)
+
IndexManagementHelper.addIndex(queueManager, indexBrowser,
((IndexFolder)link.getTreeParent().getParent()), link.getPublicKey());
+ else
+
IndexManagementHelper.addIndex(queueManager, indexBrowser, null,
link.getPublicKey());
}
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-01-26
20:48:26 UTC (rev 11622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-01-26
22:47:54 UTC (rev 11623)
@@ -82,12 +82,12 @@
button = new JButton(IconBox.indexReuse);
button.setToolTipText(I18n.getMessage("thaw.plugin.index.addIndexesFromLink"));
toolbarActions.add(new LinkManagementHelper.IndexAdder(button,
queueManager,
-
indexBrowser));
+
indexBrowser, true));
toolbarModifier.addButtonToTheToolbar(button);
rightClickMenu.add(item);
rightClickActions.add(new LinkManagementHelper.IndexAdder(item,
queueManager,
-
indexBrowser));
+
indexBrowser, true));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.copyKeys"));
rightClickMenu.add(item);
Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2007-01-26
20:48:26 UTC (rev 11622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2007-01-26
22:47:54 UTC (rev 11623)
@@ -54,12 +54,20 @@
}
public void fillInStatement(PreparedStatement st) throws SQLException {
- if (!(node instanceof IndexFolder) || node.getId() >= 0)
- st.setInt(1, node.getId());
+ int i, j;
- for (int i = 0 ; i < search.length ; i++) {
- st.setString(i+2, "%" + search[i] + "%");
+ i = 1;
+
+ if ( (node instanceof Index)
+ || node.getId() >= 0 ) {
+ st.setInt(i, node.getId());
+ i++;
}
+
+ for (j = 0 ; j < search.length ; j++) {
+ st.setString(i, "%" + search[j] + "%");
+ i++;
+ }
}
public Vector getFileList(String col, boolean asc) {
@@ -78,14 +86,14 @@
ResultSet set = st.executeQuery();
while(set.next()) {
- v.add(new thaw.plugins.index.File(db,
-
set.getInt("id"),
-
set.getString("filename"),
-
set.getString("publicKey"),
- new
java.io.File(set.getString("localPath")),
-
set.getString("mime"),
-
set.getLong("size"),
-
set.getInt("indexParent")));
+ v.add(new File(db,
+ set.getInt("id"),
+
set.getString("filename"),
+
set.getString("publicKey"),
+
(set.getString("localPath") != null ? new
java.io.File(set.getString("localPath")) : null),
+ set.getString("mime"),
+ set.getLong("size"),
+
set.getInt("indexParent")));
}
} catch(SQLException e) {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-01-26 20:48:26 UTC (rev 11622)
+++ trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-01-26 22:47:54 UTC (rev 11623)
@@ -72,7 +72,7 @@
button = new JButton(IconBox.indexReuse);
button.setToolTipText(I18n.getMessage("thaw.plugin.index.addIndexesFromLink"));
- toolbarActions.add(new LinkManagementHelper.IndexAdder(button,
queueManager, indexBrowser));
+ toolbarActions.add(new LinkManagementHelper.IndexAdder(button,
queueManager, indexBrowser, false));
toolbarModifier.addButtonToTheToolbar(button);
list.addMouseListener(this);
@@ -194,7 +194,7 @@
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addIndexesFromLink"));
rightClickMenu.add(item);
- rightClickActions.add(new
LinkManagementHelper.IndexAdder(item, queueManager, indexBrowser));
+ rightClickActions.add(new
LinkManagementHelper.IndexAdder(item, queueManager, indexBrowser, false));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.copyKeys"));
rightClickMenu.add(item);
