Changeset 9:b2bfc3bc9ba8 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

Timestamp:

Jul 12, 2012, 10:54:46 AM (12 years ago)

Author:

casties

Branch:

default

Message:

new internal actor class for creator.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (6 diffs)

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

@@ -5 +5 @@
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.SignatureException;
@@ -36 +34 @@
 import org.restlet.resource.ServerResource;
 
+import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
@@ -194 +193 @@
                 // make short user id
                 String userId = annot.getCreatorUri();
+                // remove namespace from user uri to get id
                 if (userId != null && userId.startsWith(NS.MPIWG_PERSONS_URL)) {
-                    userId = userId.replace(NS.MPIWG_PERSONS_URL, ""); // entferne
-                                                                       // NAMESPACE
-                }
-                // save as id
+                    userId = userId.replace(NS.MPIWG_PERSONS_URL, "");
+                }
+                // set as id
                 userObject.put("id", userId);
                 // get full name
@@ -390 +389 @@
              * } authUser = httpUser.getIdentifier();
              */
+        }
+        // get or create creator object
+        Actor creator = annot.getCreator();
+        if (creator == null) {
+            creator = new Actor(false, null, null);
+            annot.setCreator(creator);
         }
         // username not required, if no username given authuser will be used
@@ -414 +419 @@
         }
         // try to get full name
-        if (username != null) {
+        if (creator.getName() == null && username != null) {
             RestServer restServer = (RestServer) getApplication();
             String fullName = restServer.getFullNameFromLdap(username);
-            annot.setCreatorName(fullName);
+            creator.setName(fullName);
         }
         // userUri should be a URI, if not it will set to the MPIWG namespace
@@ -428 +433 @@
         }
         // TODO: should we overwrite the creator?
-        if (annot.getCreatorUri() == null) {
-            annot.setCreatorUri(userUri);
+        if (creator.getUri() == null) {
+            creator.setUri(userUri);
         }