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

Timestamp:

08/17/13 21:09:17 (11 years ago)

Author:

olhsha

Message:

refactored DAO-s: resource dao do not call each-other methods any more. Only the new Dispatcher method can do it. Not tested.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (5 diffs)

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

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.identifiers.AnnotationIdentifier;
-import eu.dasish.annotation.backend.identifiers.UserIdentifier;
 import eu.dasish.annotation.schema.Annotation;
-import eu.dasish.annotation.schema.AnnotationBody;
 import eu.dasish.annotation.schema.AnnotationInfo;
-import eu.dasish.annotation.schema.NewOrExistingSourceInfo;
-import eu.dasish.annotation.schema.NewSourceInfo;
 import eu.dasish.annotation.schema.ResourceREF;
 import java.sql.SQLException;
@@ -53 +49 @@
      * 
      * @param annotationID
-     * @return annotation which has an annotation ID "annotationID"
-     * if externalID is null or such annotation does not exist in the DB returns null;
+     * @return the Annotation object with empty list of sources 
+     * constructing a complete Annotation object from theresult and "retrieveSourceIDs" is done in "CompoundRequests"
+     * 
      */
-    Annotation getAnnotation(Number annotationID) throws SQLException;
+    public Annotation getAnnotationWithoutSources(Number annotationID) throws SQLException;
     
     
@@ -63 +60 @@
      * @param annotationId
      * @return 
-     * result[0] = # removed notebooks_annotations rows
-     * result[1] = # removed "annotations_principals_perissions" rows
-     * result[2] = # removed "annotatiobs_target_sources" rows
-     * result[3] = # SAFELY removed "target_sources" rows (only unused)
-     * result[4] = # removed annotation rows (should be 1)
+     * result[0] = # removed "annotations_principals_perissions" rows
+     * result[1] = # removed "annotatiobs_target_sources" rows
+     * result[2] = # removed annotation rows (should be 1)
      */
     
@@ -102 +97 @@
      * The first step for GET api/annotations?<filters>
      */
-    public List<Number> getFilteredAnnotationIDs(String link, String text, String access, String namespace, UserIdentifier owner, Timestamp after, Timestamp before);
-    
-   
+    public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String access, String namespace, Number ownerID, Timestamp after, Timestamp before);
+       
     /**
      * 
@@ -135 +129 @@
     public List<Number> retrieveSourceIDs(Number annotationID);
     
-  
+    public int addAnnotationSourcePair(Number annotationID, Number sourceID) throws SQLException;
     
 }