# HG changeset patch
# User casties
# Date 1346950979 -7200
# Node ID f0f55ab768c9bbeed744618136890efaf30408f5
# Parent aafa3884b2c41ebda35e3ab6c529eb4963b8340d
more work on HTML UI.
diff -r aafa3884b2c4 -r f0f55ab768c9 pom.xml
--- a/pom.xml Wed Sep 05 18:05:54 2012 +0200
+++ b/pom.xml Thu Sep 06 19:02:59 2012 +0200
@@ -80,6 +80,11 @@
commons-codec
1.4
+
+ org.restlet.jee
+ org.restlet.lib.org.json
+ 2.0
+
AnnotationManager
diff -r aafa3884b2c4 -r f0f55ab768c9 src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java Wed Sep 05 18:05:54 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java Thu Sep 06 19:02:59 2012 +0200
@@ -75,15 +75,20 @@
/**
* Returns List of Groups.
+ * Key has to be indexed.
*
- * @param person
+ * @param key
+ * @param query
* @return
*/
- public List getGroups(String uriQuery) {
+ public List getGroups(String key, String query) {
ArrayList groups = new ArrayList();
Index idx = getNodeIndex(NodeTypes.GROUP);
- if (uriQuery == null) uriQuery = "*";
- IndexHits groupNodes = idx.get("uri", uriQuery);
+ if (key == null) {
+ key = "uri";
+ query = "*";
+ }
+ IndexHits groupNodes = idx.query(key, query);
for (Node groupNode : groupNodes) {
Actor group = createActorFromNode(groupNode);
groups.add((Group) group);
diff -r aafa3884b2c4 -r f0f55ab768c9 src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotationStoreGroups.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotationStoreGroups.java Wed Sep 05 18:05:54 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotationStoreGroups.java Thu Sep 06 19:02:59 2012 +0200
@@ -34,29 +34,28 @@
// id from URI /annotations/groups/{id}
String id = (String) getRequest().getAttributes().get("id");
logger.debug("group-id=" + id);
- String retString="\nGroups
\n";
+ String result="\nGroups
\n";
+ result += "| id | name | uri |
|---|
";
store = getAnnotationStore();
if (id == null) {
// list all groups
- List groups = store.getGroups("*");
+ List groups = store.getGroups("uri", "*");
for (Group group : groups) {
- retString += String.format("| uri=%s |
\n", group.getUri());
+ String groupLink = group.getId();
+ result += String.format("| %s | %s | %s |
\n", groupLink, group.getId(), group.getName(), group.getUri());
}
}
- retString += "
\n\n";
+ result += "
\n\n";
logger.debug("sending:");
- logger.debug(retString);
- return new StringRepresentation(retString,MediaType.TEXT_HTML);
+ logger.debug(result);
+ return new StringRepresentation(result,MediaType.TEXT_HTML);
}
protected AnnotationStore getAnnotationStore() {
if (store == null) {
- ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
- .get("org.restlet.ext.servlet.ServletContext");
- logger.debug("Getting AnnotationStore from Context");
- store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
+ store = ((BaseRestlet) getApplication()).getAnnotationStore();
}
return store;
}
diff -r aafa3884b2c4 -r f0f55ab768c9 src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java Wed Sep 05 18:05:54 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java Thu Sep 06 19:02:59 2012 +0200
@@ -15,8 +15,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.ServletContext;
-
import net.oauth.jsontoken.Checker;
import net.oauth.jsontoken.JsonToken;
import net.oauth.jsontoken.JsonTokenParser;
@@ -37,9 +35,9 @@
import de.mpiwg.itgroup.annotations.Actor;
import de.mpiwg.itgroup.annotations.Annotation;
-import de.mpiwg.itgroup.annotations.NS;
import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
import de.mpiwg.itgroup.annotations.Group;
+import de.mpiwg.itgroup.annotations.NS;
import de.mpiwg.itgroup.annotations.Person;
import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
@@ -61,10 +59,7 @@
protected AnnotationStore getAnnotationStore() {
if (store == null) {
- ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
- .get("org.restlet.ext.servlet.ServletContext");
- logger.debug("Getting AnnotationStore from Context");
- store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
+ store = ((BaseRestlet) getApplication()).getAnnotationStore();
}
return store;
}
diff -r aafa3884b2c4 -r f0f55ab768c9 src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java Wed Sep 05 18:05:54 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java Thu Sep 06 19:02:59 2012 +0200
@@ -165,6 +165,13 @@
public abstract String getVersion();
/**
+ * @return the store
+ */
+ public AnnotationStore getAnnotationStore() {
+ return store;
+ }
+
+ /**
* returns consumer secret for consumer key. returns null if consumer key
* doesn't exist.
*