Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
In directory
james.mmbase.org:/tmp/cvs-serv22011/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
Modified Files:
DataAccessDelegate.java Query.java DataAccessor.java
Log Message:
Refactoring a little
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
Index: DataAccessDelegate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DataAccessDelegate.java 28 Nov 2008 07:30:44 -0000 1.2
+++ DataAccessDelegate.java 20 Feb 2009 07:28:54 -0000 1.3
@@ -35,7 +35,7 @@
return new DataAccessor(dataSource,elementMeta);
}
- public static List<String> getResOfRelation(List<Data> sources, Data
reldata, DataSource dataSource) {
- return new DataAccessor(dataSource).getResOfRelation(reldata,sources);
+ public static List<String> getResOfRelation(Data reldata, DataSource
dataSource) {
+ return new DataAccessor(dataSource).getResOfRelation(reldata);
}
}
Index: Query.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/Query.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Query.java 7 Oct 2008 13:01:23 -0000 1.2
+++ Query.java 20 Feb 2009 07:28:54 -0000 1.3
@@ -61,8 +61,9 @@
public String getQueryString(ElementMeta elementMeta,int offset,int limit)
throws Exception {
String sql = getAllQueryString(elementMeta);
- if(offset !=-1 && limit != -1)
+ if(offset !=-1 && limit != -1) {
sql += SQL_LIMIT+limit+SQL_OFFSET+offset;
+ }
// sql += SQL_LIMIT+limit+" ,"+offset;
return sql;
}
Index: DataAccessor.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- DataAccessor.java 19 Dec 2008 00:58:55 -0000 1.10
+++ DataAccessor.java 20 Feb 2009 07:28:54 -0000 1.11
@@ -54,6 +54,7 @@
/**
* get numbers
+ * @param type
* @return key number
* @throws Exception
*/
@@ -137,20 +138,20 @@
else if(type ==
Constants.RELATION_TYPE||type==Constants.RELATION_DATA_TYPE){//add new type
if(StringUtils.isNotEmpty(query.getRelateFieldsString(elementMeta,key))) {
relRs =
statement.executeQuery(query.getRelateFieldsString(elementMeta,key));
- parse(relRs,list,elementMeta,holder,key);
+ parse(relRs,list,elementMeta,holder);
holder.setCollection(list);
holder.setTableName(elementMeta.getDestinationRelTableName());
}
}
else if(type == Constants.SELF_RELATION_TYPE){
relRs =
statement.executeQuery(query.getSelfRelFieldString(elementMeta,key));
- parse(relRs,list,elementMeta,holder,key);
+ parse(relRs,list,elementMeta,holder);
holder.setCollection(list);
holder.setTableName(elementMeta.getSelfRelDesTableName());
}
else {
relRs =
statement.executeQuery(query.getSelfRelFieldString(elementMeta,key));
- parse(relRs,list,elementMeta,holder,key);
+ parse(relRs,list,elementMeta,holder);
holder.setCollection(list);
holder.setTableName(elementMeta.getSelfRelDesTableName());
}
@@ -167,7 +168,9 @@
private void parseResultSet(ResultSet rs,List<Elements> list,ElementMeta
elementMeta) throws SQLException {
- if(rs == null) return;
+ if(rs == null) {
+ return;
+ }
while(rs.next()) {
Elements element = new Elements();
for(String fieldName : elementMeta.getFieldNames()) {
@@ -242,9 +245,11 @@
return null;
}
- private void parse(ResultSet rs,List<Elements> list,ElementMeta
elementMeta,DataHolder holder,Integer key) throws SQLException {
+ private void parse(ResultSet rs,List<Elements> list,ElementMeta
elementMeta,DataHolder holder) throws SQLException {
- if(rs == null) return;
+ if(rs == null) {
+ return;
+ }
while(rs.next()) {
Elements element = new Elements();
for(String fieldName : elementMeta.getRelateFields()) {
@@ -282,7 +287,7 @@
}
}
- public List<String> getResOfRelation(Data relData, List<Data> sources) {
+ public List<String> getResOfRelation(Data relData) {
Connection connection = null;
Statement statement = null;
ResultSet rs = null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
