Merge with 95418fb0c49b from default

diff --cc src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
index 5c7e5d8,2de6ada..2a37719
--- 1/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
--- 2/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
+++ b/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
@@@ -1785,23 -1785,15 +1785,18 @@@ public class ExternalAPIBean implement
        }
  
        @Override
-       public List<FileHeaderDTO> searchFiles(Long userId, String query) throws ObjectNotFoundException {
+       public List<FileHeader> searchFiles(Long userId, String query) throws ObjectNotFoundException {
 +        long startTime = System.currentTimeMillis();
                if (userId == null)
                        throw new ObjectNotFoundException("No user specified");
                User user = getUser(userId);
                if (query == null)
                        throw new ObjectNotFoundException("No query specified");
                List<FileHeader> files = search(user.getId(), query);
-         long startTime2 = System.currentTimeMillis();
-               List<FileHeaderDTO> res = new ArrayList<FileHeaderDTO>();
-               for(FileHeader f : files)
-                       res.add(f.getDTO());
-         long stopTime2 = System.currentTimeMillis();
-         logger.info("DTO time: " + (stopTime2 - startTime2));
+               
 +        long stopTime = System.currentTimeMillis();
 +        logger.info("Total time: " + (stopTime - startTime));
-               return res;
+               return files;
        }
  
        /**