Project

General

Profile

« Previous | Next » 

Revision 46422

View differences:

ProjectDAO.java
39 39
	}
40 40

  
41 41
	@SuppressWarnings("unchecked")
42
	public List<Vocabulary> search(String term) {
42
	public List<Object> search(String term) {
43 43
		Disjunction d = Restrictions.disjunction();
44 44
		d.add(Restrictions.eq("acronym",term.toLowerCase()).ignoreCase());
45 45
		d.add(Restrictions.eq("title",term.toLowerCase()).ignoreCase());
46 46
		d.add(Restrictions.eq("grant",term.toLowerCase()).ignoreCase());
47 47

  
48
        List<Project> prs = createEntityCriteria().add(d).list();
49
        List<Vocabulary> voc = new ArrayList<>();
48
        return createEntityCriteria().add(d).list();
49
        /*List<Vocabulary> voc = new ArrayList<>();
50 50
        for(Project p : prs)
51
            voc.add(new Vocabulary(p.getId(), p.getAcronym() + " - " + p.getGrant() + " (" + p.getTitle() + ")"));
52
        return voc;
51
            voc.add(new Vocabulary(p.getId(), p.getAcronym() + " - " + p.getGrant() + " (" + p.getTitle() + ")",p));*/
52
        //return voc;
53 53

  
54 54
	}
55 55

  

Also available in: Unified diff