Changeset 6030

Timestamp:

02/02/10 09:12:40 (7 weeks ago)

Author:

cblackburn

Message:

List methods now return partially populated OriginalFiles? for client testing.

Location:

trunk/components/blitz

Files:

• resources/omero/Repositories.ice (modified) (1 diff)
• src/ome/services/blitz/repo/PublicRepositoryI.java (modified) (5 diffs)

trunk/components/blitz/resources/omero/Repositories.ice

@@ -39 +39 @@
              */
 
-            // TODO should we return OriginalFiles here for acmTime, etc.
-            omero::api::StringSet list(string path) throws ServerError;
-            omero::api::StringSet listDirs(string path) throws ServerError;
-            omero::api::StringSet listFiles(string path) throws ServerError;
+            // These list methods provide all files, registered or not.
+            omero::api::OriginalFileList list(string path) throws ServerError;
+            omero::api::OriginalFileList listDirs(string path) throws ServerError;
+            omero::api::OriginalFileList listFiles(string path) throws ServerError;
 
             // These list methods provide only registered files

trunk/components/blitz/src/ome/services/blitz/repo/PublicRepositoryI.java

@@ -29 +29 @@
 import omero.grid._RepositoryDisp;
 import omero.model.Format;
+import omero.model.FormatI;
 import omero.model.OriginalFile;
 import omero.model.OriginalFileI;
@@ -124 +125 @@
 
     @SuppressWarnings("unchecked")
-    public List<String> list(String path, Current __current) throws ServerError {
+    
+    public List<OriginalFile> list(String path, Current __current) throws ServerError {
         File file = checkPath(path);
         List<File> files = Arrays.asList(file.listFiles());
-        return filesToPaths(files);
-    }
-
-    public List<String> listDirs(String path, Current __current)
+        return filesToOriginalFiles(files);
+    }
+
+    public List<OriginalFile> listDirs(String path, Current __current)
             throws ServerError {
         File file = checkPath(path);
         List<File> files = Arrays.asList(file.listFiles((FileFilter)FileFilterUtils.directoryFileFilter()));
-        return filesToPaths(files);
-    }
-
-    public List<String> listFiles(String path, Current __current)
+        return filesToOriginalFiles(files);
+    }
+
+    public List<OriginalFile> listFiles(String path, Current __current)
             throws ServerError {
         File file = checkPath(path);
         List<File> files = Arrays.asList(file.listFiles((FileFilter)FileFilterUtils.fileFileFilter()));
-        return filesToPaths(files);
+        return filesToOriginalFiles(files);
     }
 
@@ -192 +194 @@
     public List<OriginalFile> listKnown(String path, Current __current)
             throws ServerError {
-        // TODO Auto-generated method stub
-        return null;
+        File file = checkPath(path);
+        List<File> files = Arrays.asList(file.listFiles());
+        return knownOriginalFiles(files);
     }
 
     public List<OriginalFile> listKnownDirs(String path, Current __current)
             throws ServerError {
-        // TODO Auto-generated method stub
-        return null;
+        File file = checkPath(path);
+        List<File> files = Arrays.asList(file.listFiles((FileFilter)FileFilterUtils.directoryFileFilter()));
+        return knownOriginalFiles(files);
     }
 
     public List<OriginalFile> listKnownFiles(String path, Current __current)
             throws ServerError {
-        // TODO Auto-generated method stub
-        return null;
+        File file = checkPath(path);
+        List<File> files = Arrays.asList(file.listFiles((FileFilter)FileFilterUtils.fileFileFilter()));
+        return knownOriginalFiles(files);
     }
 
     public Format format(String path, Current __current) throws ServerError {
-        // TODO Auto-generated method stub
-        return null;
+        return getFileFormat(path);
     }
 
@@ -244 +248 @@
     }
     
+    // Just return a dummy format for testing purposes.
+    private Format getFileFormat(String path) {
+        Format dummy = new FormatI();
+        dummy.setValue(rstring("DUMMY-FORMAT"));
+        return dummy;
+    }
 
     private List<String> filesToPaths(Collection<File> files) {
@@ -252 +262 @@
         return rv;
     }
+    
+    private List<OriginalFile> filesToOriginalFiles(Collection<File> files) {
+        List rv = new ArrayList<OriginalFile>();
+        for (File f : files) {
+            rv.add(createOriginalFile(f));
+        }
+        return rv;
+    }
+    
+    private List<OriginalFile> knownOriginalFiles(Collection<File> files) {
+        List rv = new ArrayList<OriginalFile>();
+/*        for (File f : files) {
+            OriginalFile file = getOriginalFileOrNull(f.getAbsolutePath());
+            if (file != null) {
+                rv.add(file);
+            }
+        } */
+        return rv;
+    }
+    
+
+    private OriginalFile createOriginalFile(File f) {
+        // How do I confirm if an OriginalFle is already registered?
+        // Is that necessary here?
+        OriginalFile file = new OriginalFileI();
+        file.setPath(rstring(f.getAbsolutePath()));
+        file.setSize(rlong(f.length()));
+        file.setSha1(rstring("UNKNOWN"));
+        // What more do I need to set here, times, details?
+        
+        // This needs to be unique - see #
+        file.setName(rstring(f.getAbsolutePath()));
+        
+        // How should I get the format of a file?
+        file.setFormat(getFileFormat(f.getAbsolutePath()));
+        
+        return file;
+    }
+    
+    // THIS FAILS AT PRESENT. NEED TO SORT OUT THE RETURN TYPE FROM THE QUERY 
+    //     ome.model.core.OriginalFile vs omero.model.OriginalFile
+    // Very weak at present, returns one file.
+    // No checking further for uniqueness
+    private OriginalFile getOriginalFileOrNull(String path) {
+        try {
+            final String queryString = "from OriginalFile as o where o.path = '"
+                    + path + "'";
+            OriginalFile file = (OriginalFile) executor.execute(
+                    principal, new Executor.SimpleWork(this,
+                            "getOriginalFileOrNull") {
+
+                        @Transactional(readOnly = true)
+                        public Object doWork(Session session, ServiceFactory sf) {
+                            return sf.getQueryService().findByQuery(
+                                    queryString, null);
+                        }
+                    });
+            return file;
+        } catch (RuntimeException re) {
+            return null;
+        }
+    }
+
+
+
 }