Issue #49

ceskaexpedice · Mar 11, 2015 · 324cb57 · 324cb57
1 parent 6441f4a
commit 324cb57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/common/src/main/java/cz/incad/kramerius/security/database/updateright.stg b/common/src/main/java/cz/incad/kramerius/security/database/updateright.stg
@@ -109,11 +109,18 @@ insertRight_show_print_menu() ::=<<
 >>
 
 
-
 updateUserEntities() ::=<<
+
     alter table user_entity alter column name drop not null;
     alter table user_entity alter column surname drop not null;
-
+
+    DELETE FROM group_user_assoc
+        WHERE user_id IN (SELECT user_id
+              FROM (SELECT user_id,
+                             row_number() over (partition BY loginname ORDER BY user_id) AS rnum
+                     FROM user_entity) t
+              WHERE t.rnum > 1);
+
     DELETE FROM user_entity
         WHERE user_id IN (SELECT user_id
               FROM (SELECT user_id,
@@ -123,4 +130,5 @@ updateUserEntities() ::=<<
 
     DROP INDEX LOGINNAME_IDX; 
     CREATE UNIQUE INDEX LOGINNAME_IDX ON USER_ENTITY (LOGINNAME);
->>
+>>
+
diff --git a/rest/src/main/java/cz/incad/kramerius/rest/api/k5/client/item/ItemResource.java b/rest/src/main/java/cz/incad/kramerius/rest/api/k5/client/item/ItemResource.java
@@ -105,10 +105,10 @@ public Response stream(@PathParam("pid") String pid,
             checkPid(pid);
             if (!FedoraUtils.FEDORA_INTERNAL_STREAMS.contains(dsid)) {
                 if (!PIDSupport.isComposedPID(pid)) {
-                    String mimeTypeForStream = this.fedoraAccess
-                            .getMimeTypeForStream(pid, dsid);
                     final InputStream is = this.fedoraAccess.getDataStream(pid,
                             dsid);
+                    String mimeTypeForStream = this.fedoraAccess
+                            .getMimeTypeForStream(pid, dsid);
                     StreamingOutput stream = new StreamingOutput() {
                         public void write(OutputStream output)
                                 throws IOException, WebApplicationException {