Author: batosai
Date: 2008-08-11 03:30:51 +0000 (Mon, 11 Aug 2008)
New Revision: 21738
Modified:
trunk/apps/WoT/src/plugins/WoT/IdentityInserter.java
trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
Log:
Made OwnIdentities insert automatic.
Modified: trunk/apps/WoT/src/plugins/WoT/IdentityInserter.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/IdentityInserter.java 2008-08-11
02:58:47 UTC (rev 21737)
+++ trunk/apps/WoT/src/plugins/WoT/IdentityInserter.java 2008-08-11
03:30:51 UTC (rev 21738)
@@ -61,8 +61,7 @@
// Insert
client.insert(ib, false, "identity.xml", false,
client.getInsertContext(false), this);
-
- identity.setLastInsert(null);
+
db.store(identity);
}
Modified: trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoTplugin.java 2008-08-11 02:58:47 UTC
(rev 21737)
+++ trunk/apps/WoT/src/plugins/WoT/WoTplugin.java 2008-08-11 03:30:51 UTC
(rev 21738)
@@ -12,7 +12,6 @@
import com.db4o.Db4o;
import com.db4o.ObjectContainer;
import com.db4o.ObjectSet;
-import com.db4o.foundation.TreeObject;
import freenet.client.HighLevelSimpleClient;
import freenet.clients.http.PageMaker;
@@ -125,9 +124,7 @@
row.addChild("th", "Last change");
row.addChild("th", "Last insert");
row.addChild("th", "Publish TrustList ?");
- row.addChild("th", "Insert");
-
while(ownIdentities.hasNext()) {
OwnIdentity id = ownIdentities.next();
row=identitiesTable.addChild("tr");
@@ -137,19 +134,10 @@
if(id.getLastInsert() == null) {
cell.addChild("p", "In progress...");
}
- else if (id.getLastInsert().equals(new
Date(0))) {
- cell.addChild("p", "Never");
- }
else {
cell.addChild(new HTMLNode("a", "href",
id.getRequestURI() + "/identity.xml", id.getLastInsert().toString()));
}
row.addChild("td",
id.getProp("publishTrustList").equals("true") ? "Yes" : "No");
-
- // Insert button, will be automatic later
- HTMLNode cell2 = row.addChild("td");
- HTMLNode insertForm = pr.addFormChild(cell2,
SELF_URI + "/insertIdentity", "insertForm");
- insertForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "identity",
id.getRequestURI().toString() });
- insertForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "insert", "Insert now !" });
}
}
@@ -331,9 +319,6 @@
else if(page.equals("/viewTree")) {
return
makeKnownIdentitiesPage(request.getPartAsString("ownerURI", 1024));
}
- else if (page.equals("/insertIdentity")) {
- return insertIdentity(request);
- }
else if (page.equals("/setTrust")) {
return updateTrust(request);
}
@@ -351,11 +336,21 @@
String comment = request.getPartAsString("comment",
1024);
wot.setTrust(new Trust(truster, trustee, value,
comment));
+
+ if(truster instanceof OwnIdentity) {
+ OwnIdentity id = (OwnIdentity) truster;
+ if(id.getLastInsert() != null) { // Insert
already in progress
+ id.setLastInsert(null);
+ db.store(id);
+ inserter.insert(id);
+ }
+ }
+
db.commit();
return
makeKnownIdentitiesPage(request.getPartAsString("truster", 1024));
- } catch (MalformedURLException e) {
+ } catch (Exception e) {
return e.getLocalizedMessage();
}
}
@@ -385,7 +380,7 @@
try {
OwnIdentity identity = new OwnIdentity( new
FreenetURI(request.getPartAsString("insertURI",1024)).setKeyType("USK"),
new
FreenetURI(request.getPartAsString("requestURI",1024)).setKeyType("USK"),
-
new Date(0),
+
null,
new Date());
identity.setProp("nickName",
request.getPartAsString("nickName", 1024), db);
identity.setProp("publishTrustList", "true", db);
@@ -396,37 +391,16 @@
db.store(identity);
db.store(score);
db.commit();
+
+ inserter.insert(identity);
}
- catch(MalformedURLException e) {
+ catch(Exception e) {
// TODO Make a good looking error messages system
return e.getLocalizedMessage();
}
return makeOwnIdentitiesPage();
}
- private String insertIdentity(HTTPRequest request) {
-
- FreenetURI uri;
- try {
- uri = new
FreenetURI(request.getPartAsString("identity", 1024));
- } catch (MalformedURLException e) {
- return e.getLocalizedMessage();
- }
-
- ObjectSet<OwnIdentity> ownIdentities = db.queryByExample(new
OwnIdentity(null, uri, null, null));
- if (ownIdentities.size() == 0) return "Identity not found";
-
- OwnIdentity identity = ownIdentities.next();
-
- try {
- inserter.insert(identity);
- } catch (Exception e) {
- return e.getLocalizedMessage();
- }
-
- return makeOwnIdentitiesPage();
- }
-
@Override
public String handleHTTPPut(HTTPRequest request) throws
PluginHTTPException {
return null;
