Changeset 3138

Timestamp:

07/15/13 16:35:18 (11 years ago)

Author:

olhsha

Message:

basic get-methods for annotations (given a notebook) have been implemented.

Location:

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

Files:

• AnnotationDao.java (modified) (2 diffs)
• impl/JdbcAnnotationDao.java (modified) (3 diffs)

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

@@ -18 +18 @@
 package eu.dasish.annotation.backend.dao;
 
+import eu.dasish.annotation.schema.AnnotationInfo;
 import eu.dasish.annotation.schema.Annotations;
+import eu.dasish.annotation.schema.ResourceREF;
+import java.util.List;
 
 /**
@@ -26 +29 @@
  */
 public interface AnnotationDao {
-
+    
+     // Returns the list of annotation Id-s  for the notebook id.
+    List<Number> getAnnotationIDs(Number notebookID);
+    
+     // Returns the list of annotation info-s  for the notebook id.
+    List<AnnotationInfo> getAnnotationInfos(Number notebookID);
+    
+     // Returns the list of annotations Id-s  for the notebook id.
+    List<ResourceREF> getAnnotationREFs(Number notebookID);
+    
     // Returns the annotations object for the notebook id.
     Annotations getAnnotations(Number notebookID);
+    
+   
 }

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

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.dao.AnnotationDao;
+import eu.dasish.annotation.schema.Annotation;
+import eu.dasish.annotation.schema.AnnotationInfo;
 import eu.dasish.annotation.schema.Annotations;
+import eu.dasish.annotation.schema.ResourceREF;
+import eu.dasish.annotation.schema.Sources;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
 import javax.sql.DataSource;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
 
@@ -28 +36 @@
  * @author Peter Withers <peter.withers@mpi.nl>
  */
+
+/*
+ *  annotation (
+    annotation_id SERIAL UNIQUE NOT NULL,
+    external_id UUID UNIQUE NOT NULL,
+    time_stamp timestamp with time zone default now(),
+    owner_id integer,
+    headline tCRext,
+    body_xml xml
+);
+ * 
+ * 
+ */
+
+
 public class JdbcAnnotationDao extends SimpleJdbcDaoSupport implements AnnotationDao {
 
@@ -33 +56 @@
         setDataSource(dataSource);
     }
+    
+    ////////////////////////////////////////////////////////////////////////
+     @Override            
+    public List<Number> getAnnotationIDs(Number notebookID) {
+       String sql = "SELECT notebooks_annotations.annotation_id  FROM notebooks_annotations where notebook_id = ?";
+       return getSimpleJdbcTemplate().query(sql, annotationIDRowMapper, notebookID.toString()); 
+    }
+    
+    private final RowMapper<Number> annotationIDRowMapper = new RowMapper<Number>() {        
+        @Override
+        public Integer mapRow(ResultSet rs, int rowNumber) throws SQLException {
+            Integer annotationId = rs.getInt("annotation_id");
+            return annotationId;
+        }
+    };
+    
+    ////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public Annotations getAnnotations(Number notebookID) {
-        return new Annotations(); // todo: complete the query required here
-//        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public List<AnnotationInfo> getAnnotationInfos(Number notebookID) {        
+        String sql = "SELECT annotation.* FROM annotation WHERE annotation.annotation_id  IN ?";
+        return getSimpleJdbcTemplate().query(sql, annotationInfoRowMapper, getAnnotationIDs(notebookID)); 
     }
+    
+    private final RowMapper<AnnotationInfo> annotationInfoRowMapper = new RowMapper<AnnotationInfo>() {        
+        @Override
+        public AnnotationInfo mapRow(ResultSet rs, int rowNumber) throws SQLException {
+           AnnotationInfo annotationInfo = new AnnotationInfo();
+           annotationInfo.setOwner(getResourceREF(Integer.toString(rs.getInt("owner_id"))));
+           annotationInfo.setHeadline(rs.getString("headline")); 
+           annotationInfo.setTargetSources(getSources(rs.getString("body_xml")));
+           return annotationInfo;
+        }
+    };
+    
+    
+    /////////////////////////////////////////////////
+    
+    @Override
+    public List<ResourceREF> getAnnotationREFs(Number notebookID) {        
+        String sql = "SELECT annotation.annotation_id FROM annotation WHERE annotation.annotation_id  IN ?";
+        return getSimpleJdbcTemplate().query(sql, annotationREFRowMapper, getAnnotationIDs(notebookID)); 
+    }
+    
+    private final RowMapper<ResourceREF> annotationREFRowMapper = new RowMapper<ResourceREF>() {        
+        @Override
+        public ResourceREF mapRow(ResultSet rs, int rowNumber) throws SQLException {
+           ResourceREF annotationREF = new ResourceREF();
+           annotationREF.setRef(Integer.toString(rs.getInt("annotation_id")));
+           return annotationREF;
+        }
+    };
+    
+    /////////////////////////////////////////////////
+    private ResourceREF getResourceREF(String resourceID){
+       ResourceREF result = new ResourceREF();
+       result.setRef(resourceID); 
+       return result;
+    }
+    
+    //TODO implement when xml-body stucture is discussed!
+    //BTW do we have to get source REF, not the whole sources here??
+    private Sources getSources(String some_xml) {
+        Sources result = new Sources();
+        return result;
+    }
+    
+    
+    
+    ////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public Annotations getAnnotations(Number notebookID) {        
+        String sql = "SELECT annotation.* FROM annotation WHERE annotation.annotation_id  IN ?";
+        return null; // not omplemented yet
+        
+    }
+    
 }