Project

General

Profile

« Previous | Next » 

Revision 55730

[angular7|library]

Merging Trunk into branch 55541:55729

View differences:

dataset.service.ts
45 45
                                 res[1]['language'],  //11
46 46
                                 res[1]['country'], //12
47 47
                                 res[2], //13
48
                                 (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null //14
48
                                 (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null, //14
49
                                  res[1]['journal'] //15
49 50
                    ]))
50 51
                    .pipe(map(res => this.parseDatasetInfo(res)));
51 52
  }
......
67 68
      this.datasetInfo.dateofacceptance = data[0].dateofacceptance;
68 69
      this.datasetInfo.publisher = data[0].publisher;
69 70
      if(!Array.isArray(data[0].description)) {
70
        this.datasetInfo.description = data[0].description;
71
        this.datasetInfo.description = String(data[0].description);
71 72
      } else {
72
        this.datasetInfo.description = data[0].description[0];
73
        this.datasetInfo.description = String(data[0].description[0]);
73 74
      }
74 75
      this.datasetInfo.embargoEndDate = data[0].embargoenddate;
75 76
    }
......
238 239
      });
239 240
    }
240 241
    this.datasetInfo.similarResearchResults = this.parsingFunctions.sortByPercentage(this.datasetInfo.similarResearchResults);
242
    if(data[15] != null) {
243
      this.datasetInfo.journal = {"journal": "", "issn": "", "lissn": "", "eissn": "", "issue": "", "volume": "", "start_page": "", "end_page": ""}
241 244

  
245
      this.datasetInfo.journal['journal'] = data[15].content;
246
      this.datasetInfo.journal['issn'] = data[15].issn;
247
      this.datasetInfo.journal['lissn'] = data[15].lissn;
248
      this.datasetInfo.journal['eissn'] = data[15].eissn;
249
      this.datasetInfo.journal['issue'] = data[15].iss;
250
      this.datasetInfo.journal['volume'] = data[15].vol;
251
      this.datasetInfo.journal['start_page'] = data[15].sp;
252
      this.datasetInfo.journal['end_page'] = data[15].ep;
253
    }
242 254

  
243 255
    return this.datasetInfo;
244 256
  }

Also available in: Unified diff