Project

General

Profile

« Previous | Next » 

Revision 49550

'resultbestlicense' field of index renamed to 'resultbestaccessright' and 'bestlicense' field renamed to 'bestaccessright' | htmlProjectReport - project landing: fix query for research data tab in app box | Remove '-' when there are no unclassified subjects in landing pages | Similar Research Results and Related Research Results: case for software results added | Publication landing, Dataset landing, Software landing: 'collectedfrom' parsed through 'instance' field | Search Pages and project landing page: Alert when CSV download fails | Organization landing: encoding funder's info in queries

View differences:

publication.service.ts
39 39
                              res[1]['oaf:result']['journal'],
40 40
                              res[1]['oaf:result']['language'],
41 41
                              res[1]['oaf:result']['subject'],
42
                              res[1]['oaf:result']['bestlicense'],
42
                              res[1]['oaf:result']['bestaccessright'],
43 43
                              res[1]['oaf:result']['collectedfrom'],
44 44
                              (res[1]['extraInfo']!= undefined && res[1]['extraInfo']['citations']!= undefined)? res[1]['extraInfo']['citations']['citation']:null,
45 45
                              res[1]['oaf:result']['context'],
......
75 75
    }
76 76

  
77 77
    this.publicationInfo.title = {"name": "", "url": "", "accessMode": ""};
78
    if(data[0]['bestlicense'].hasOwnProperty("classid")) {
79
      this.publicationInfo.title.accessMode = data[0]['bestlicense'].classid;
78
    if(data[0]['bestaccessright'].hasOwnProperty("classid")) {
79
      this.publicationInfo.title.accessMode = data[0]['bestaccessright'].classid;
80 80
    }
81 81

  
82 82
    if(data[1] != null) {
......
153 153
              url = instance['webresource'][0].url;
154 154
            }
155 155

  
156
            if(instance.hasOwnProperty("collectedfrom")) {
157
              this.publicationInfo.collectedFrom = this.parsingFunctions.parseCollectedFrom(instance['collectedfrom']);
158
            }
159

  
156 160
            if(instance.hasOwnProperty("hostedby")) {
157 161
              if(instance['hostedby'].name != "other resources" && instance['hostedby'].name != "Unknown Repository") {
158 162
                this.parsingFunctions.parseDownloadFrom(this.publicationInfo.downloadFrom, instance, url);
......
218 222
    }
219 223

  
220 224
    // if(data[8] != null) {
221
    //     this.publicationInfo.bestlicense = data[8].classid;
225
    //     this.publicationInfo.bestaccessright = data[8].classid;
222 226
    // }
223 227

  
224
    if(data[9] != null) {
225
      this.publicationInfo.collectedFrom = this.parsingFunctions.parseCollectedFrom(data[9]);
226
    }
228
    // if(data[9] != null) {
229
    //   this.publicationInfo.collectedFrom = this.parsingFunctions.parseCollectedFrom(data[9]);
230
    // }
227 231

  
228 232
    this.publicationInfo.downloadFrom = this.parsingFunctions.addPublisherToDownloadFrom(
229 233
                this.publicationInfo.downloadFrom, this.publicationInfo.publisher,

Also available in: Unified diff