Changeset 3369

Timestamp:

08/13/13 12:31:23 (11 years ago)

Author:

olhsha

Message:

adding and testing the method which retrieves the list of annotations that refer to the sources from the input list.

Location:

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

Files:

• main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (2 diffs)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java (modified) (1 diff)

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

@@ -105 +105 @@
     public List<ResourceREF> getAnnotationREFs(List<Number> annotationIDs); 
     
-    
+    /**
+     * 
+     * @param sourceIDs
+     * @return the list of annotationdIDs of the annotations that are having target sources from "sourceIDs" list
+     */
     public List<Number> getAnnotationIDsForSources(List<Number> sourceIDs);
    

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

@@ -80 +80 @@
             if (!annotationIDs.isEmpty()) {
                 String values = makeListOfValues(annotationIDs);
-                table = "( SELECT "+annotationStar + "WHERE "+ annotation_id +"IN " + values + ") ";
+                table = "( SELECT DISTINCT "+annotationStar + "WHERE "+ annotation_id +"IN " + values + ") ";
             }
             else{
@@ -133 +133 @@
         }        
         String values = makeListOfValues(sourceIDs);
-        StringBuilder query = new StringBuilder("SELECT ");
+        StringBuilder query = new StringBuilder("SELECT DISTINCT ");
         query.append(annotation_id).append(" FROM ").append(annotationsSourcesTableName).append(" WHERE ").append(source_id).append(" IN ");
         query.append(values);

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

@@ -362 +362 @@
         assertEquals(expBody, result.getBody().getAny().get(0).toString());
     }
-
-    @Test
-    @Ignore
+    
+    
+    /**
+     * testing public List<Number> getAnnotationIDsForSources(List<Number> sourceIDs);
+    
+    **/
+    @Test    
+    public void testGetAnnotationIDsForSources() {
+        System.out.println("test getAnnotationIDs for sources");
+        List<Number> sources = new ArrayList<Number>();
+        sources.add(1);
+        sources.add(2);
+        List<Number> result = jdbcAnnotationDao.getAnnotationIDsForSources(sources);
+        assertEquals (2, result.size());
+        //assertEquals(2, result.get(0));
+        //assertEquals(3, result.get(1));
+    }
+    
+    @Test    
     public void testGetExternalID() {
         System.out.println("getAnnotationID");