Changeset 5661 for DASISH

Timestamp:

09/19/14 09:59:35 (10 years ago)

Author:

olhsha@mpi.nl

Message:

adding two html forms and two services for updating user-annotation access and public access of an annotation

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend

Files:

• CHANGES.txt (modified) (1 diff)
• UPDATE.txt (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (2 diffs)
• src/main/java/eu/dasish/annotation/backend/dao/DBDispatcher.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (6 diffs)
• src/main/webapp/changePermissions.html (added)
• src/main/webapp/index.jsp (modified) (1 diff)
• src/main/webapp/publicAccess.html (added)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt

@@ -45 +45 @@
 Moreover, an atribute xml:id is added to the schema for main resource instances.
 
+July 14, 2014. Added 1: api to send an image cached representation as a file, via its path
+or URI. At least will help in testing because I have problems with turning an image file
+onto a stream to send it via FF Client in a request body. Added 2: admin can change the external
+ID (UUID) of a resource. At least will help with testing. 
+
+
+

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt

@@ -19 +19 @@
 This id is already set up in the jsp page, so no changes should be done there.
 
+4. Nothing is to be update in settings (web.xml, context.xml) and the database.
+
 
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml

@@ -363 +363 @@
         <netbeans.hint.license>gpl20</netbeans.hint.license>  
         <plugin.license.copyrightYear>2013</plugin.license.copyrightYear>
-        <project.version>1.5</project.version>
+        <project.version>1.5.1</project.version>
         <shibboleth.version>1.0.4</shibboleth.version>
     </properties>

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java

@@ -25 +25 @@
 import java.sql.SQLException;
 import java.util.List;
+import java.util.UUID;
 
 /**
@@ -40 +41 @@
      */
     
+    public List<UUID> getExternalIdFromHeadline(String headline);
+    
+    public List<Number>  getInternalIDsFromHeadline(String headline);
     /**
      * 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBDispatcher.java

@@ -394 +394 @@
 
     ResponseBody makeAccessResponseEnvelope(Number resourceID, Resource resource);
+    
+    UUID getPrincipalExternalIdFromName(String fullName) throws NotInDataBaseException;
+    
+    List<UUID> getAnnotationExternalIdsFromHeadline(String headline);
+    
+    List<Number> getAnnotationInternalIDsFromHeadline(String headline);
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/PrincipalDao.java

@@ -53 +53 @@
      public UUID getPrincipalExternalIDFromRemoteID(String remoteID) throws NotInDataBaseException;
      
+     public UUID getExternalIdFromName(String fullName) throws NotInDataBaseException;
      
      public List<Number> getPrincipalIDsWithAccessForNotebook(Number notebookID, Access access);

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java

@@ -962 +962 @@
         }
     }
+    
+    @Override
+    public UUID getPrincipalExternalIdFromName(String fullName) throws NotInDataBaseException{
+       return principalDao.getExternalIdFromName(fullName);
+    }
+    
+    @Override
+    public List<UUID> getAnnotationExternalIdsFromHeadline(String headline){
+        return annotationDao.getExternalIdFromHeadline(headline);
+    }
+    
+    @Override
+    public List<Number> getAnnotationInternalIDsFromHeadline(String headline){
+        return annotationDao.getInternalIDsFromHeadline(headline);
+    }
 
     //// privee ///

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java

@@ -110 +110 @@
         List<Access> result = this.loggedQuery(sql.toString(), public_RowMapper, annotationID);
         return result.get(0);
+    }
+    
+    
+    @Override
+    public List<UUID> getExternalIdFromHeadline(String headline){
+        StringBuilder requestDB = new StringBuilder("SELECT ");
+        requestDB.append(external_id).append(" FROM ").append(annotationTableName).append(" WHERE ").append("'").append(headline).append("'").append("= ?");
+        return this.loggedQuery(requestDB.toString(), externalIDRowMapper, headline);        
+    }
+    
+    @Override
+    public List<Number> getInternalIDsFromHeadline(String headline){
+        StringBuilder requestDB = new StringBuilder("SELECT ");
+        requestDB.append(annotation_id).append(" FROM ").append(annotationTableName).append(" WHERE ").append("'").append(headline).append("'").append("= ?");
+        return this.loggedQuery(requestDB.toString(), internalIDRowMapper, headline);        
     }
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java

@@ -157 +157 @@
     
     @Override
+    public UUID getExternalIdFromName(String fullName) throws NotInDataBaseException {
+        StringBuilder requestDB = new StringBuilder("SELECT ");
+        requestDB.append(external_id).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_name).append("= ? LIMIT 1");
+        List<UUID> result = this.loggedQuery(requestDB.toString(), externalIDRowMapper, fullName);
+        if (result.isEmpty()) {
+            throw new NotInDataBaseException("principal", "full name", fullName);
+        }
+        return result.get(0); 
+    }
+    
+    @Override
     public String getTypeOfPrincipalAccount(Number internalID) {
         StringBuilder requestDB = new StringBuilder("SELECT ");

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java

@@ -34 +34 @@
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -40 +41 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -61 +63 @@
 @Transactional(rollbackFor = {Exception.class})
 public class AnnotationResource extends ResourceResource {
-   
+
     public void setHttpServletResponse(HttpServletResponse httpServletResponse) {
         this.httpServletResponse = httpServletResponse;
@@ -210 +212 @@
     public JAXBElement<ResponseBody> createAnnotation(Annotation annotation) throws IOException {
 
-            Map params = new HashMap();
-            params.put("annotation", annotation);
-            ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new AddAnnotation());
-            if (result != null) {
-                return (new ObjectFactory()).createResponseBody(result);
-            } else {
-                return (new ObjectFactory()).createResponseBody(new ResponseBody());
-            }
-        }
-
-    
+        Map params = new HashMap();
+        params.put("annotation", annotation);
+        ResponseBody result = (ResponseBody) (new RequestWrappers(this)).wrapRequestResource(params, new AddAnnotation());
+        if (result != null) {
+            return (new ObjectFactory()).createResponseBody(result);
+        } else {
+            return (new ObjectFactory()).createResponseBody(new ResponseBody());
+        }
+    }
 
     private class AddAnnotation implements ILambda<Map, ResponseBody> {
@@ -327 +327 @@
         }
     }
+    
+    //////////////////////////////////////////
+    
+     //////////////////////////////////////////////
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("publicaccessform")
+    public String updatePubliAccessFromForm(
+            @FormParam("annotationId") String annotationDatabaseId,
+            @FormParam("annotationHeadline") String annotationHeadline,
+            @FormParam("access") String access)
+            throws IOException {
+        
+        if (access.trim().equals("")) {
+            access = "none";
+        }
+        
+        Access accessTyped = Access.fromValue(access);
+        int updatedAnnotations = 0;
+        
+        if (annotationDatabaseId == null || annotationDatabaseId.trim().equals("")) {
+            List<Number> annotationIDs = dbDispatcher.getAnnotationInternalIDsFromHeadline(annotationHeadline);
+            if (annotationIDs == null || annotationIDs.isEmpty()) {
+                return "No annotations with this headline have been found";
+            };
+            int count = 0;
+            for (Number annotationID : annotationIDs) {
+                count = dbDispatcher.updatePublicAttribute(annotationID, accessTyped);;
+                updatedAnnotations = updatedAnnotations+count;
+            }            
+            return (updatedAnnotations + " row(s) are updated");
+        } else {
+            try {
+            Number annotationID = dbDispatcher.getResourceInternalIdentifier(UUID.fromString(annotationDatabaseId), Resource.ANNOTATION);
+            updatedAnnotations= dbDispatcher.updatePublicAttribute(annotationID, accessTyped);
+            } catch (NotInDataBaseException e) {
+              httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.toString());   
+            }
+        }
+        return (updatedAnnotations + " annotation(s) are updated.");
+    }
+    
     ////////////////////////////////////////////////////
 
@@ -337 +380 @@
         return this.genericUpdateDeleteAccess(annotationExternalId, principalExternalId, access);
     }
+    
+
+
+    //////////////////////////////////////////////
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("permissionform")
+    public String updatePermissionFromForm(@FormParam("login") String remoteID,
+            @FormParam("fullName") String fullName,
+            @FormParam("userId") String principalDatabaseId,
+            @FormParam("annotationId") String annotationDatabaseId,
+            @FormParam("annotationHeadline") String annotationHeadline,
+            @FormParam("access") String access)
+            throws IOException {
+        
+        if (access.trim().equals("")) {
+            access = null;
+        }
+        
+        try {
+            if (principalDatabaseId == null || principalDatabaseId.trim().equals("")) {
+                if (remoteID != null && !remoteID.trim().equals("")) {
+                    principalDatabaseId = dbDispatcher.getPrincipalExternalIDFromRemoteID(remoteID).toString();
+                } else {
+                    if (fullName != null) {
+                        principalDatabaseId = dbDispatcher.getPrincipalExternalIdFromName(fullName).toString();
+                    } else {
+                        httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "No user information is given");
+                    }
+                }
+            }
+        } catch (NotInDataBaseException e) {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, e.toString()); 
+        }
+
+        if (annotationDatabaseId == null || annotationDatabaseId.trim().equals("")) {
+            List<UUID> annotationIds = dbDispatcher.getAnnotationExternalIdsFromHeadline(annotationHeadline);
+            if (annotationIds == null || annotationIds.isEmpty()) {
+                return "No annotations with this headline found";
+            };
+            int count = 0;
+            String tmp = null;
+            for (UUID annotationId : annotationIds) {
+                tmp = this.genericUpdateDeleteAccess(annotationId.toString(), principalDatabaseId, Access.fromValue(access));
+                if (!tmp.startsWith("0")) {
+                    count++;
+                }
+            }            
+            return (count + " row(s) are updated");
+        } else {
+            return this.genericUpdateDeleteAccess(annotationDatabaseId, principalDatabaseId, Access.fromValue(access));
+        }
+    }
+
     ////////////////////////////////////////////
-
     private String genericUpdateDeleteAccess(String annotationId, String principalId, Access access) throws IOException {
         Map params = new HashMap();

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp

@@ -40 +40 @@
         <br> 
         <a href="api/authentication/logout"> logout</a> <br> 
+        <br>
         <br> 
+        <a href="changePermissions.html"> Change access mode for a user and an annotation </a><br> 
+        <br>
+        <br> 
+        <a href="publicAccess.html"> Change public access mode for an annotation </a> <br> 
+        <br>
         
         <b>Test URI-s</b><br>