Author: jflesch
Date: 2006-10-22 19:34:38 +0000 (Sun, 22 Oct 2006)
New Revision: 10691
Modified:
trunk/apps/Thaw/src/thaw/plugins/index/File.java
trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java
trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java
Log:
Database schema update
Modified: trunk/apps/Thaw/src/thaw/plugins/index/File.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/File.java 2006-10-22 19:15:33 UTC
(rev 10690)
+++ trunk/apps/Thaw/src/thaw/plugins/index/File.java 2006-10-22 19:34:38 UTC
(rev 10691)
@@ -65,6 +65,7 @@
this.db = db;
id = resultSet.getInt("id");
+ fileName = resultSet.getString("filename").trim();
publicKey = resultSet.getString("publicKey").trim();
localPath = resultSet.getString("localPath");
size = resultSet.getLong("size");
@@ -252,34 +253,36 @@
}
- st = db.getConnection().prepareStatement("INSERT INTO
files (id, publicKey, "+
+ st = db.getConnection().prepareStatement("INSERT INTO
files (id, filename, publicKey, "+
"localPath, mime, size, category, indexParent) "+
- "VALUES
(?, ?, ?, ?, ?, ?, ?)");
+ "VALUES
(?, ?, ?, ?, ?, ?, ?, ?)");
st.setInt(1, id);
+ st.setString(2, fileName);
+
if(publicKey != null)
- st.setString(2, publicKey);
+ st.setString(3, publicKey);
else
- st.setString(2, fileName);
+ st.setString(3, fileName);
if(localPath != null)
- st.setString(3, localPath);
+ st.setString(4, localPath);
else
- st.setNull(3, Types.VARCHAR);
+ st.setNull(4, Types.VARCHAR);
if(mime != null)
- st.setString(4, mime);
+ st.setString(5, mime);
else
- st.setNull(4, Types.VARCHAR);
+ st.setNull(5, Types.VARCHAR);
- st.setLong(5, size);
+ st.setLong(6, size);
if(category != null)
- st.setString(6, category);
+ st.setString(7, category);
else
- st.setNull(6, Types.VARCHAR);
+ st.setNull(7, Types.VARCHAR);
- st.setInt(7, parent.getId());
+ st.setInt(8, parent.getId());
st.execute();
} catch(SQLException e) {
@@ -312,33 +315,35 @@
try {
PreparedStatement st;
- st = db.getConnection().prepareStatement("UPDATE files
SET publicKey = ?, localPath = ?, mime= ?, size = ?, category = ?, indexParent
= ? WHERE id = ?");
+ st = db.getConnection().prepareStatement("UPDATE files
SET filename = ?, publicKey = ?, localPath = ?, mime= ?, size = ?, category =
?, indexParent = ? WHERE id = ?");
+ st.setString(1, fileName);
+
if(publicKey != null)
- st.setString(1, publicKey);
+ st.setString(2, publicKey);
else
- st.setString(1, fileName);
+ st.setString(2, fileName);
if(localPath != null)
- st.setString(2, localPath);
+ st.setString(3, localPath);
else
- st.setNull(2, Types.VARCHAR);
+ st.setNull(3, Types.VARCHAR);
if(mime != null)
- st.setString(3, mime);
+ st.setString(4, mime);
else
- st.setNull(3, Types.VARCHAR);
+ st.setNull(4, Types.VARCHAR);
- st.setLong(4, size);
+ st.setLong(5, size);
if(category != null)
- st.setString(5, category);
+ st.setString(6, category);
else
- st.setNull(5, Types.VARCHAR);
+ st.setNull(6, Types.VARCHAR);
- st.setInt(6, getParent().getId());
+ st.setInt(7, getParent().getId());
- st.setInt(7, id);
+ st.setInt(8, id);
st.execute();
} catch(SQLException e) {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2006-10-22
19:15:33 UTC (rev 10690)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2006-10-22
19:34:38 UTC (rev 10691)
@@ -322,7 +322,7 @@
if(modifiables)
columnNames.add(I18n.getMessage("thaw.common.localPath"));
-
columnNames.add(I18n.getMessage("thaw.plugin.index.category"));
+
//columnNames.add(I18n.getMessage("thaw.plugin.index.category"));
columnNames.add(I18n.getMessage("thaw.common.key"));
columnNames.add(I18n.getMessage("thaw.common.status"));
}
@@ -390,16 +390,16 @@
if(column == 2 && modifiables)
return file.getLocalPath();
+ //if( (column == 2 && !modifiables)
+ // || (column == 3 && modifiables) )
+ // return file.getCategory();
+
if( (column == 2 && !modifiables)
|| (column == 3 && modifiables) )
- return file.getCategory();
+ return file.getPublicKey();
if( (column == 3 && !modifiables)
- || (column == 4 && modifiables) )
- return file.getPublicKey();
-
- if( (column == 4 && !modifiables)
- || (column == 5 && modifiables) ) {
+ || (column == 4 && modifiables) ) {
return file.getTransfer();
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-10-22 19:15:33 UTC
(rev 10690)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-10-22 19:34:38 UTC
(rev 10691)
@@ -567,7 +567,7 @@
fileList = new Vector();
try {
- String query = "SELECT id, publicKey, mime, size,
localPath, category, indexParent FROM files WHERE indexParent = ?";
+ String query = "SELECT id, filename, publicKey, mime,
size, localPath, category, indexParent FROM files WHERE indexParent = ?";
if(columnToSort != null) {
query = query + "ORDER BY " + columnToSort;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java 2006-10-22
19:15:33 UTC (rev 10690)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexCategory.java 2006-10-22
19:34:38 UTC (rev 10691)
@@ -149,7 +149,10 @@
for(Iterator it = children.iterator();
it.hasNext();) {
IndexTreeNode node =
(IndexTreeNode)((DefaultMutableTreeNode)it.next()).getUserObject();
- result = result + node.getPublicKey() + "\n";
+ result = result + node.getPublicKey();
+
+ if (it.hasNext())
+ result = result + "\n";
}
return result;
@@ -161,7 +164,10 @@
for(Iterator it = children.iterator();
it.hasNext();) {
IndexTreeNode node =
(IndexTreeNode)((DefaultMutableTreeNode)it.next()).getUserObject();
- result = result + node.getPrivateKey() + "\n";
+ result = result + node.getPrivateKey();
+
+ if (it.hasNext())
+ result = result + "\n";
}
return result;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2006-10-22
19:15:33 UTC (rev 10690)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2006-10-22
19:34:38 UTC (rev 10691)
@@ -87,7 +87,7 @@
fileList = new Vector();
try {
- PreparedStatement st = makeSearchQuery("id, publicKey,
localPath, mime, size, category, indexParent",
+ PreparedStatement st = makeSearchQuery("id, filename,
publicKey, localPath, mime, size, category, indexParent",
"files",
indexIds, search, columnToSort, asc);
if (st.execute()) {
ResultSet results = st.getResultSet();
Modified: trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java 2006-10-22
19:15:33 UTC (rev 10690)
+++ trunk/apps/Thaw/src/thaw/plugins/index/TableCreator.java 2006-10-22
19:34:38 UTC (rev 10691)
@@ -16,16 +16,8 @@
* | |-- [...]
* |
* |-- indexes (name, publicKey, [privateKey], positionInTree)
- * |-- fileCategories (name, [positionInTree])
- * | |-- fileCategories (name, [positionInTree])
- * | | |-- [...]
- * | |
- * | |-- links (indexName, indexPublicKey)
- * | |-- files (publicKey, mime, size)
- * | |-- metadatas (name, value)
- * |
* |-- links (indexName, indexPublicKey)
- * |-- files (publicKey, mime, size)
+ * |-- files (filename, publicKey, mime, size)
* |-- metadatas (name, value)
* </pre>
*
@@ -66,18 +58,25 @@
+ "parent INTEGER NULL, "
+ "PRIMARY KEY (id), "
+ "FOREIGN KEY (parent) REFERENCES indexCategories
(id))");
+
+ sendQuery(db,
+ "CREATE CACHED TABLE categories ("
+ + "id INTEGER IDENTITY NOT NULL,"
+ + "name VARCHAR(255) NOT NULL)");
sendQuery(db,
"CREATE CACHED TABLE files ("
+ "id INTEGER IDENTITY NOT NULL,"
+ + "filename VARCHAR(255) NOT NULL,"
+ "publicKey VARCHAR(350) NOT NULL," // key ~= 100 +
filename == 255 max => 350
+ "localPath VARCHAR(500) NULL,"
+ "mime VARCHAR(50) NULL,"
+ "size BIGINT NOT NULL,"
- + "category VARCHAR(255) NULL,"
+ + "category INTEGER NULL,"
+ "indexParent INTEGER NOT NULL,"
+ "PRIMARY KEY (id),"
- + "FOREIGN KEY (indexParent) REFERENCES indexes
(id))");
+ + "FOREIGN KEY (indexParent) REFERENCES indexes (id),"
+ + "FOREIGN KEY (category) REFERENCES categories
(id))");
sendQuery(db,
"CREATE CACHED TABLE links ("
