Mercurial > hg > AnnotationManager
changeset 1:f2f41d0dedf5
minimal changes
author | dwinter |
---|---|
date | Wed, 23 Nov 2011 15:26:33 +0100 |
parents | 77530be3c747 |
children | 6888ae3287b8 |
files | src/de/mpiwg/itgroup/annotationManager/restlet/AddAndSearchAnnotations.java src/de/mpiwg/itgroup/annotationManager/restlet/RestServer.java |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/de/mpiwg/itgroup/annotationManager/restlet/AddAndSearchAnnotations.java Tue Nov 22 15:47:57 2011 +0100 +++ b/src/de/mpiwg/itgroup/annotationManager/restlet/AddAndSearchAnnotations.java Wed Nov 23 15:26:33 2011 +0100 @@ -158,8 +158,8 @@ for(String xpointer:xpointers){ String decoded =URLDecoder.decode(xpointer,"utf-8"); Matcher m=rg.matcher(decoded); - m.find(); - //if (m.matches()){ + + if (m.find()){ { JSONObject jo = new JSONObject(); jo.put("start", m.group(1)); @@ -167,10 +167,10 @@ jo.put("end", m.group(3)); jo.put("endOffset", m.group(4)); ja.put(jo); - //} + } } m=rg1.matcher(xpointer); - if (m.matches()){ + if (m.find()){ JSONObject jo = new JSONObject(); jo.put("start", m.group(1)); jo.put("startOffset", m.group(2));
--- a/src/de/mpiwg/itgroup/annotationManager/restlet/RestServer.java Tue Nov 22 15:47:57 2011 +0100 +++ b/src/de/mpiwg/itgroup/annotationManager/restlet/RestServer.java Wed Nov 23 15:26:33 2011 +0100 @@ -175,7 +175,7 @@ String sp = "com.sun.jndi.ldap.LdapCtxFactory"; env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, sp); - String ldapUrl = "ldap://mpiwgldap.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de";//TODO should go into config file + String ldapUrl = "ldap://ldapreplik.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de";//TODO should go into config file env.put(javax.naming.Context.PROVIDER_URL, ldapUrl); DirContext dctx;