Changeset 2563

Timestamp:

06/30/08 21:11:28 (5 months ago)

Author:

jmoore

Message:

ticket:1002 - Initial work on pagination in IPojos

Location:

trunk/components

Files:

• blitz/resources/omero/Constants.ice (modified) (1 diff)
• model/src/ome/util/builders/PojoOptions.java (modified) (2 diffs)
• server/test/ome/server/itests/PojosServiceTest.java (modified) (3 diffs)

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

@@ -63 +63 @@
     const string POJOEXPERIMENTER = "experimenter";   // omero::RLong
     const string POJOGROUP        = "group";          // omero::RLong
-
+    const string POJOLIMIT        = "limit";          // omero::RInt
+    const string POJOOFFSET       = "offset";         // omero::RInt
+    const string POJOSTARTTIME    = "startTime";      // omero::RTime
+    const string POJOENDTIME      = "endTime";        // omero::RTime
     /*
      * Used by IPojos.findCGCPaths(...,string algo,...)

trunk/components/model/src/ome/util/builders/PojoOptions.java

@@ -39 +39 @@
     public static final String END_TIME = "endTime";
 
+    public static final String OFFSET = "offset";
+
+    public static final String LIMIT = "limit";
+
     private final Map options = new HashMap();
 
@@ -150 +154 @@
 
     /*
+     * ============================== Pagination ==============================
+     */
+
+    public PojoOptions paginate(int offset, int limit) {
+        options.put(OFFSET, offset);
+        options.put(LIMIT, limit);
+        return this;
+    }
+
+    public PojoOptions noPagination() {
+        remove(OFFSET);
+        remove(LIMIT);
+        return this;
+    }
+
+    public boolean isPagination() {
+        return options.containsKey(OFFSET);
+    }
+
+    public Integer getOffset() {
+        return (Integer) options.get(OFFSET);
+    }
+
+    public Integer getLimit() {
+        return (Integer) options.get(LIMIT);
+    }
+
+    /*
      * ============================== Filtered by Group
      * ==============================

trunk/components/server/test/ome/server/itests/PojosServiceTest.java

@@ -37 +37 @@
 /**
  * 
- * @author Josh Moore &nbsp;&nbsp;&nbsp;&nbsp; <a
- *         href="mailto:josh.moore@gmx.de">josh.moore@gmx.de</a>
- * @version 1.0 <small> (<b>Internal version:</b> $Rev$ $Date$) </small>
- * @since 1.0
+ * @author Josh Moore, josh at glencoesoftware.com
  */
 public class PojosServiceTest extends AbstractManagedContextTest {
@@ -123 +120 @@
     }
 
-    // ticket 651
+    @Test(groups = "ticket:651")
     public void testIntervalInPojoOptions() {
         Long userID = factory.getAdminService().getEventContext()
@@ -149 +146 @@
         iPojos.getImages(Dataset.class, Collections.singleton(ds.getId()),
                 options.map());
+    }
+
+    @Test(groups = "ticket:1018")
+    public void testIntervalPojoMethodsReturnsCounts() {
+        Long userID = factory.getAdminService().getEventContext()
+                .getCurrentUserId();
+        // create
+        Dataset ds = new Dataset();
+        ds.setName("ticket:1018");
+        Image im = new Image();
+        im.setName("ticket:1018");
+        Pixels pi = ObjectFactory.createPixelGraph(null);
+        im.addPixels(pi);
+        ds.linkImage(im);
+        ds = iUpdate.saveAndReturnObject(ds);
+
+        // test
+        Timestamp startTime = getDate("before");
+        Timestamp endTime = getDate("after");
+
+        PojoOptions options = new PojoOptions();
+        options.exp(userID);
+        options.startTime(startTime);
+        options.endTime(endTime);
+
+        Set<Image> images = iPojos.getImagesByOptions(options.map());
+        Image i = images.iterator().next();
+        assertTrue(i.getAnnotationLinksCountPerOwner() != null);
+
     }