Revision 3510 trunk/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/srw/filters/SRWFilter.java

View differences:

SRWFilter.java
40 40
*/
41 41
package es.gva.cit.catalogClient.srw.filters;
42 42

  
43
import es.gva.cit.catalogClient.filters.IFilter;
43
import es.gva.cit.catalogClient.filters.AbstractFilter;
44 44
import es.gva.cit.catalogClient.languages.CommonQueryLanguage;
45 45
import es.gva.cit.catalogClient.querys.Query;
46 46

  
......
50 50
 *
51 51
 * @author Jorge Piera Llodra (piera_jor@gva.es)
52 52
 */
53
public class SRWFilter extends Query implements IFilter {
53
public class SRWFilter extends AbstractFilter {
54 54
    public SRWFilter(Query query) {
55
        super(query.getTitle(), query.getTitleFilter(), query.getAbstract(),
56
            query.getThemeKey(), query.getTopic(), query.getScale(),
57
            query.getProvider(), query.getDateFrom(), query.getDateTo(),
58
            query.getCoordenates(), query.getCoordenatesFilter(),query.getTranslator());
59
        setMinimized(query.isMinimized());
60
        setCoordinatesClicked(query.isCoordinatesClicked());
55
        super(query);
61 56
    }
62 57

  
63 58
    /**
......
69 64
        String pregunta = null;
70 65

  
71 66
        // Construimos una RemoteBooleanQuery
72
        CommonQueryLanguage query = new CommonQueryLanguage();
67
        CommonQueryLanguage filter = new CommonQueryLanguage();
73 68

  
74
        if (this.getTitle() != null) {
75
            query.addClauses("dc.title", this.getTitle(), this.getTitleFilter());
69
        if (query.getTitle() != null) {
70
            filter.addClauses("dc.title", query.getTitle(), query.getTitleFilter());
76 71
        }
77 72

  
78
        if (this.getAbstract() != null) {
79
            query.addClauses("dc.subject", this.getAbstract(), "E");
73
        if (query.getAbstract() != null) {
74
            filter.addClauses("dc.subject", query.getAbstract(), "E");
80 75
        }
81 76

  
82 77
        //if (this.getThemeKey() != null) 
83 78
        //query.addClauses("", this.getThemeKey(),"Y");
84 79
        //if (this.getScale() != null) 
85 80
        //query.addClauses("map_scale", this.getScale(),"E");
86
        if (this.getProvider() != null) {
87
            query.addClauses("dc.creator", this.getProvider(), "E");
81
        if (query.getProvider() != null) {
82
            filter.addClauses("dc.creator", query.getProvider(), "E");
88 83
        }
89 84

  
90 85
        //if (this.getDateFrom() != null) 
91 86
        //query.addClauses("2072", "210", "4",this.getDateFrom(),"E");
92 87
        //if (this.getDateTo() != null) 
93 88
        //query.addClauses("2073", "210", "2",this.getDateTo(),"E");
94
        pregunta = query.toString();
89
        pregunta = filter.toString();
95 90

  
96 91
        System.out.println(pregunta);
97 92

  

Also available in: Unified diff