Project

General

Profile

« Previous | Next » 

Revision 60411

- fix order by titles
- context query: get results made in the same dashboard
- add claimed_in_dashboard in the result
- commit changes in Test CopyFromBeta

View differences:

FetchClaimHandler.java
300 300
        while(rs.next()) {
301 301
            Claim claim= new Claim();
302 302
            claims.add(claim);
303
            claim.setId(rs.getString(1));
303
            Integer i = 1;
304
            claim.setId(rs.getString(i++));
304 305
            DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
305
            Date date = format.parse(rs.getString(2));
306
            Date date = format.parse(rs.getString(i++));
306 307
            claim.setDate(date);
307
            claim.setUserMail(rs.getString(3));
308
            claim.setSourceType(rs.getString(4));
309
            claim.setTargetType(rs.getString(5));
310
            claim.setSemantics(rs.getString(6));
311

  
308
            claim.setUserMail(rs.getString(i++));
309
            claim.setSourceType(rs.getString(i++));
310
            claim.setTargetType(rs.getString(i++));
311
            claim.setSemantics(rs.getString(i++));
312
            log.debug(addCurationInfo);
312 313
            if(addCurationInfo) {
313
                String curationDate =rs.getString(7);
314
                String curationDate =rs.getString(i++);
314 315
                if(curationDate != null) {
315 316
                    date = format.parse(curationDate);
316 317
                    claim.setCurationDate(date);
317 318
                }
318
                claim.setCuratedBy(rs.getString(8));
319
                claim.setCuratedBy(rs.getString(i++));
320
            }else{
321
                i+=2;
319 322
            }
320
            claim.setApproved(rs.getBoolean(9));
321
            claim.setSource(buildEntity(rs,10,claim.getSourceType()));
322
            claim.setTarget(buildEntity(rs,22,claim.getTargetType()));
323
            log.debug(i);
324
            claim.setApproved(rs.getBoolean(i++));
325
            claim.setClaimedInDashboard(rs.getString(i++));
326
            claim.setSource(buildEntity(rs,i,claim.getSourceType()));
327
            claim.setTarget(buildEntity(rs,i+12,claim.getTargetType()));
323 328

  
324 329
        }
325 330
        return claims;

Also available in: Unified diff