Changeset 19:f0f55ab768c9 in AnnotationManagerN4J for src


Ignore:
Timestamp:
Sep 6, 2012, 5:02:59 PM (12 years ago)
Author:
casties
Branch:
default
Message:

more work on HTML UI.

Location:
src/main/java/de/mpiwg/itgroup/annotations
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

    r18 r19  
    7676    /**
    7777     * Returns List of Groups.
    78      *
    79      * @param person
    80      * @return
    81      */
    82     public List<Group> getGroups(String uriQuery) {
     78     * Key has to be indexed.
     79     *
     80     * @param key
     81     * @param query
     82     * @return
     83     */
     84    public List<Group> getGroups(String key, String query) {
    8385        ArrayList<Group> groups = new ArrayList<Group>();
    8486        Index<Node> idx = getNodeIndex(NodeTypes.GROUP);
    85         if (uriQuery == null) uriQuery = "*";
    86         IndexHits<Node> groupNodes = idx.get("uri", uriQuery);
     87        if (key == null) {
     88            key = "uri";
     89            query = "*";
     90        }
     91        IndexHits<Node> groupNodes = idx.query(key, query);
    8792        for (Node groupNode : groupNodes) {
    8893            Actor group = createActorFromNode(groupNode);

  • src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotationStoreGroups.java

    r18 r19  
    3535        String id = (String) getRequest().getAttributes().get("id");
    3636        logger.debug("group-id=" + id);
    37         String retString="<html><body>\n<h1>Groups</h1>\n<table>";
     37        String result="<html><body>\n<h1>Groups</h1>\n<table>";
     38        result += "<tr><th>id</th><th>name</th><th>uri</th></tr>";
    3839        store = getAnnotationStore();
    3940        if (id == null) {
    4041            // list all groups
    41             List<Group> groups = store.getGroups("*");
     42            List<Group> groups = store.getGroups("uri", "*");
    4243            for (Group group : groups) {
    43                 retString += String.format("<tr><td>uri=%s</td></tr>\n", group.getUri());
     44                String groupLink = group.getId();
     45                result += String.format("<tr><td><a href=\"%s\">%s</a></td><td>%s</td><td>%s</td></tr>\n", groupLink, group.getId(), group.getName(), group.getUri());
    4446            }
    4547           
    4648        }
    47         retString += "</table>\n</body>\n</html>";
     49        result += "</table>\n</body>\n</html>";
    4850       
    4951        logger.debug("sending:");
    50         logger.debug(retString);
    51         return new StringRepresentation(retString,MediaType.TEXT_HTML);
     52        logger.debug(result);
     53        return new StringRepresentation(result,MediaType.TEXT_HTML);
    5254    }
    5355
    5456    protected AnnotationStore getAnnotationStore() {
    5557        if (store == null) {
    56             ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
    57                     .get("org.restlet.ext.servlet.ServletContext");
    58             logger.debug("Getting AnnotationStore from Context");
    59             store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
     58            store = ((BaseRestlet) getApplication()).getAnnotationStore();
    6059        }
    6160        return store;

  • src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

    r18 r19  
    1616import java.util.regex.Pattern;
    1717
    18 import javax.servlet.ServletContext;
    19 
    2018import net.oauth.jsontoken.Checker;
    2119import net.oauth.jsontoken.JsonToken;
    … …  
    3836import de.mpiwg.itgroup.annotations.Actor;
    3937import de.mpiwg.itgroup.annotations.Annotation;
    40 import de.mpiwg.itgroup.annotations.NS;
    4138import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
    4239import de.mpiwg.itgroup.annotations.Group;
     40import de.mpiwg.itgroup.annotations.NS;
    4341import de.mpiwg.itgroup.annotations.Person;
    4442import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
    … …  
    6260    protected AnnotationStore getAnnotationStore() {
    6361        if (store == null) {
    64             ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
    65                     .get("org.restlet.ext.servlet.ServletContext");
    66             logger.debug("Getting AnnotationStore from Context");
    67             store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
     62            store = ((BaseRestlet) getApplication()).getAnnotationStore();
    6863        }
    6964        return store;

  • src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

    r18 r19  
    166166
    167167    /**
     168     * @return the store
     169     */
     170    public AnnotationStore getAnnotationStore() {
     171        return store;
     172    }
     173
     174    /**
    168175     * returns consumer secret for consumer key. returns null if consumer key
    169176     * doesn't exist.
Note: See TracChangeset for help on using the changeset viewer.