Project

General

Profile

« Previous | Next » 

Revision 47770

Not escaping JSON for refine fields.

View differences:

modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/solr/SolrResultSet.java
184 184
                        BrowseField bf = null;
185 185
                        for (int i = 0; i < field.getValueCount(); i++) {
186 186
                            bf = new BrowseField();
187
                            logger.debug(field.getValues().get(i).getName());
188
                            logger.debug(StringEscapeUtils.unescapeJava(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName())));
187
                            //bf.setId(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName()));
188
                            bf.setId(field.getValues().get(i).getName());
189
                            String[] facetedValues = field.getValues().get(i).getName().split("\\|\\|",2);
189 190

  
190
                            bf.setId(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName()));
191

  
192
                            String[] facetedValues = field.getValues().get(i).getName().split("\\|\\|",2);
193 191
                            if (facetedValues.length > 1) {
194
                                bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(facetedValues[1]));
192
                                //bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(facetedValues[1]));
193
                                bf.setName(facetedValues[1]);
195 194

  
196 195
                            } else if (field.getValues().get(i).getName().split("_\\:\\:",2).length > 1) {
197
                                bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName().split("\\:\\:",2)[1]).replaceAll("\\:\\:", "\\|"));
196
                                //bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName().split("\\:\\:",2)[1]).replaceAll("\\:\\:", "\\|"));
197
                                bf.setName(field.getValues().get(i).getName().split("\\:\\:",2)[1].replaceAll("\\:\\:", "\\|"));
198 198

  
199 199
                            } else {
200
                                bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName()));
200
                                //bf.setName(org.apache.commons.lang3.StringEscapeUtils.escapeJson(field.getValues().get(i).getName()));
201
                                bf.setName(field.getValues().get(i).getName());
201 202
                            }
202 203

  
203 204
                            bf.setCount(field.getValues().get(i).getCount() + "");
modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/web/api/CSVResponseFormat.java
14 14
    public static final String result = "Title,Authors,Publication Year,DOI,Funder|Project Name (GA Number),Access\n";
15 15

  
16 16
    //TODO SPECIAL
17
    public static final String result_special = "Title,Authors,Publication Year,DOI,Download from,Publication Type,Journal,Funder,Project Name (GA Number),Access\n";
17
    public static final String result_special = "Title,Authors,Publication Year,DOI,Download from,Type,Journal,Funder,Project Name (GA Number),Access\n";
18 18

  
19 19

  
20 20
    public static final String response = "%s%s";

Also available in: Unified diff