Merge branch 'issue_88' into 'master'

This fixes #88

Closes #88

See merge request !105

www/Gruntfile.js

-module.exports = function(grunt) {
-
-  grunt.initConfig({   
+module.exports = function (grunt) {
+  grunt.initConfig({
     jshint: {
-      files: ['Gruntfile.js', 'src/*.js', 'test/**/*.js'],
+      files: ["Gruntfile.js", "src/*.js", "test/**/*.js"],
       options: {
         globals: {
-          jQuery: true
-        }
-      }
-    }, 
-    
+          jQuery: true,
+        },
+      },
+    },
+
     watch: {
-      files: ['src/*.js', 'templates/*.js', 'css/*.css'],
-      tasks: [ 'uglify','dustjs','cssmin','wiredep:dev']
+      files: ["src/*.js", "templates/*.js", "css/*.css"],
+      tasks: ["uglify", "dustjs", "cssmin", "wiredep:dev"],
     },
-    
+
     uglify: {
       options: {
-         mangle: true
+        mangle: false,
+        beautify: true,
+        compress: false,
       },
       prod: {
         files: {
-          'min/components.min.js': [
-          'bower_components/jquery/dist/jquery.js',
-          'bower_components/bootstrap/dist/js/bootstrap.js',
-          'bower_components/dustjs-linkedin/dist/dust-full.min.js',
-          'bower_components/dustjs-helpers/dist/dust-helpers.min.js',
-          'bower_components/lodash/dist/lodash.min.js',
-          'bower_components/moment/moment.js' ],
-          'min/doi.min.js': [
-          'src/*js']
-        }
-      }
+          "min/components.min.js": [
+            "bower_components/jquery/dist/jquery.js",
+            "bower_components/bootstrap/dist/js/bootstrap.js",
+            "bower_components/dustjs-linkedin/dist/dust-full.min.js",
+            "bower_components/dustjs-helpers/dist/dust-helpers.min.js",
+            "bower_components/lodash/dist/lodash.min.js",
+            "bower_components/moment/moment.js",
+          ],
+          "min/doi.min.js": ["src/*js"],
+        },
+      },
     },
-  
+
     wiredep: {
       prod: {
-        src: 'index.html' 
+        src: "index.html",
       },
       dev: {
-        src: 'dev.html'
-      }
+        src: "dev.html",
+      },
     },
-  
+
     cssmin: {
       prod: {
         files: {
-        'min/output.min.css' : ['bower_components/bootstrap/dist/css/bootstrap.css', 'css/*.css' ],
-        }
-      }
+          "min/output.min.css": ["bower_components/bootstrap/dist/css/bootstrap.css", "css/*.css"],
+        },
+      },
     },
 
-    dustjs : {
-      compile : {
-        files : {
-          'min/precompiled.templates.min.js' : [ 'templates/**js' ]
-        }
-      }
+    dustjs: {
+      compile: {
+        files: {
+          "min/precompiled.templates.min.js": ["templates/**js"],
+        },
+      },
     },
-  
+
     includeSource: {
       options: {
-        basePath: '',
-        baseUrl: 'www'
+        basePath: "",
+        baseUrl: "www",
       },
       dev: {
         files: {
-          'dev.html': 'dev.tpl.html'
-        }
-      }
+          "dev.html": "dev.tpl.html",
+        },
+      },
     },
-    plato : {
-      all : {
-        options : {
-          complexity : {
-            logicalor : true,
-            switchcase : true,
-            forin : true,
-            trycatch : true
-          }
+    plato: {
+      all: {
+        options: {
+          complexity: {
+            logicalor: true,
+            switchcase: true,
+            forin: true,
+            trycatch: true,
+          },
+        },
+        files: {
+          reports: ["src/*.js"],
         },
-        files : {
-          'reports' : [ 'src/*.js' ],
-        }
-      }
-    }  
+      },
+    },
   });
 
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-wiredep');
-  grunt.loadNpmTasks('grunt-dustjs');
-  grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-include-source');
-  grunt.loadNpmTasks('grunt-plato');
- 
-  grunt.registerTask('default', ['jshint', 'dustjs', 'uglify', 'cssmin']);
-  grunt.registerTask('dev', ['includeSource:dev', 'dustjs', 'cssmin', 'wiredep:dev', 'plato']);
+  grunt.loadNpmTasks("grunt-contrib-jshint");
+  grunt.loadNpmTasks("grunt-contrib-watch");
+  grunt.loadNpmTasks("grunt-contrib-uglify");
+  grunt.loadNpmTasks("grunt-wiredep");
+  grunt.loadNpmTasks("grunt-dustjs");
+  grunt.loadNpmTasks("grunt-contrib-cssmin");
+  grunt.loadNpmTasks("grunt-include-source");
+  grunt.loadNpmTasks("grunt-plato");
+
+  grunt.registerTask("default", ["jshint", "dustjs", "uglify", "cssmin"]);
+  grunt.registerTask("dev", ["includeSource:dev", "dustjs", "cssmin", "wiredep:dev", "plato"]);
 };

www/dev.html

@@ -5,6 +5,7 @@
          <title> ESRF - DOI </title>
          <link rel="icon" href="/src/images/favicon.ico">
          
+         <script src="min/components.min.js"></script>
          <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
      
          <!-- Using grunt-wiredep, the proper js files from bower components are included below -->

www/dev.tpl.html

@@ -5,6 +5,7 @@
          <title> ESRF - DOI </title>
          <link rel="icon" href="/src/images/favicon.ico">
          
+         <script src="min/components.min.js"></script>
          <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
      
          <!-- Using grunt-wiredep, the proper js files from bower components are included below -->

www/package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "browserify": "^16.2.3",
-    "grunt": "^1.2.1",
+    "grunt": "^1.3.0",
     "grunt-contrib-cssmin": "^2.2.1",
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-include-source": "^1.1.0",

www/src/doicontroller.js

 function DOIController(view) {
-    var _this = this;
-    // doiServer = the server which provides doi details from a given doi name.
-    this.doiServer = "https://api.datacite.org/dois/";
-    this.icatPlusServer = "https://icatplus.esrf.fr/doi/";
-    // contentNegicationServer retrieves the DOI metadata in another format required by google search engine 
-    this.contentNegociationServer = "https://data.crosscite.org/";
-
-    // 10.5072 is the test esrf doi prefix;
-    // 10.15151 is the production esrf doi prefix;
-    this.acceptedPrefix = ["10.5072", "10.15151"];
-    this.view = view;
-
-    this.experimentalReportController = new ExperimentalReportController();
-
-    this.experimentalReportController.onSuccess.attach(function (sender, data) {
-        _this.view.renderExperimentalReportData(data);
-    });
-
-    this.experimentalReportController.onError.attach(function (sender, data) {
-        console.log("Error when retrieving fileList from SMIS.");
-        _this.view.renderErrorForExperimentalReport();
-    });
-
+  var _this = this;
+  // doiServer = the server which provides doi details from a given doi name.
+  this.doiServer = "https://api.datacite.org/dois/";
+  this.icatPlusServer = "https://icatplus.esrf.fr/doi/";
+  // contentNegicationServer retrieves the DOI metadata in another format required by google search engine
+  this.contentNegociationServer = "https://data.crosscite.org/";
+
+  // 10.5072 is the test esrf doi prefix;
+  // 10.15151 is the production esrf doi prefix;
+  this.acceptedPrefix = ["10.5072", "10.15151"];
+  this.view = view;
+
+  this.experimentalReportController = new ExperimentalReportController();
+
+  this.experimentalReportController.onSuccess.attach(function (sender, data) {
+    _this.view.renderExperimentalReportData(data);
+  });
+
+  this.experimentalReportController.onError.attach(function (sender, data) {
+    console.log("Error when retrieving fileList from SMIS.");
+    _this.view.renderErrorForExperimentalReport();
+  });
 }
 
 /**
@@ -30,135 +29,133 @@ function DOIController(view) {
  * executed. Reloading the page is treated by .fail as it should be.
  */
 DOIController.prototype.isValidDOIData = function (doiData) {
-    return true;
+  return true;
 };
 
-
 DOIController.prototype.render = function (doi, data) {
-    var _this = this;
-    // Test abnormal length of the json object
-    if (!_this.isValidDOIData(data)) {
-        _this.view.renderError("Not Found", _this.origin);
-    } else {
-        // Extract data and fill doiData with it
+  var _this = this;
+  // Test abnormal length of the json object
+  if (!_this.isValidDOIData(data)) {
+    _this.view.renderError("Not Found", _this.origin);
+  } else {
+    // Extract data and fill doiData with it
 
-        var doiData = new DoiData();
-        var jsonExtractor = new JsonExtractor();
+    var doiData = new DoiData();
+    var jsonExtractor = new JsonExtractor();
 
-        doiData.title = jsonExtractor.getTitle(data);
-        doiData.doi = jsonExtractor.getDOI(data);
-        doiData.dataciteLink = _this.doiServer + doi;
-        doiData.publisher = jsonExtractor.getPublisher(data);
-        doiData.creators = jsonExtractor.getCreators(data);
-        doiData.publiclyAccessibleYear = jsonExtractor.getPubliclyAccessibleYear(data);
+    doiData.title = jsonExtractor.getTitle(data);
+    doiData.doi = jsonExtractor.getDOI(data);
+    doiData.dataciteLink = _this.doiServer + doi;
+    doiData.publisher = jsonExtractor.getPublisher(data);
+    doiData.creators = jsonExtractor.getCreators(data);
+    doiData.publiclyAccessibleYear = jsonExtractor.getPubliclyAccessibleYear(data);
 
-        doiData.abstract = jsonExtractor.getAbstract(data);
-        doiData.investigationId = jsonExtractor.getInvestigationId(data);
-        doiData.resourceType = jsonExtractor.getResourceType(data);
+    doiData.abstract = jsonExtractor.getAbstract(data);
+    doiData.investigationId = jsonExtractor.getInvestigationId(data);
+    doiData.resourceType = jsonExtractor.getResourceType(data);
 
-        doiData.proposalType = jsonExtractor.getFieldFromSubject(data.subjects, "Proposal Type Description");
+    doiData.proposalType = jsonExtractor.getFieldFromSubject(data.subjects, "Proposal Type Description");
 
-        doiData.resourceTypeGeneral = jsonExtractor.getResourceTypeGeneral(data);
-        doiData.sessionDate = jsonExtractor.getSessionDate(data);
+    doiData.resourceTypeGeneral = jsonExtractor.getResourceTypeGeneral(data);
+    doiData.sessionDate = jsonExtractor.getSessionDate(data);
 
-        var proposalNames = jsonExtractor.getFieldFromSubject(data.subjects, "Proposal");
-        var beamlines = jsonExtractor.getFieldFromSubject(data.subjects, "Instrument");
+    var proposalNames = jsonExtractor.getFieldFromSubject(data.subjects, "Proposal");
+    var beamlines = jsonExtractor.getFieldFromSubject(data.subjects, "Instrument");
 
-        _this.experimentalReportController.requestFilenameList(proposalNames[0]);
-        doiData.accessibility = doiData.getAccessibilityStatus(doiData.resourceType, doiData.sessionDate, doiData.publiclyAccessibleYear);
-        doiData.accessMessage = _this.view.setDataAccessMessage(doiData);
+    _this.experimentalReportController.requestFilenameList(proposalNames[0]);
+    doiData.accessibility = doiData.getAccessibilityStatus(doiData.resourceType, doiData.sessionDate, doiData.publiclyAccessibleYear);
+    doiData.accessMessage = _this.view.setDataAccessMessage(doiData);
 
-        doiData.citation = _this.createCitation(doiData);
+    doiData.citation = _this.createCitation(doiData);
 
-        if (doiData.resourceType === CONSTANTS.ES_RESOURCE_TYPE) {
-            doiData.beamlineUrls = _this.getBeamlineUrl(beamlines, doiData.sessionDate, doiData.resourceType);
-            doiData.mintingYear = moment(doiData.sessionDate).year();
-        }
+    if (doiData.resourceType === CONSTANTS.ES_RESOURCE_TYPE) {
+      doiData.beamlineUrls = _this.getBeamlineUrl(beamlines, doiData.sessionDate, doiData.resourceType);
+      doiData.mintingYear = moment(doiData.sessionDate).year();
+    }
 
-        if (doiData.resourceType === CONSTANTS.DC_RESOURCE_TYPE) {
-            doiData.beamlineUrls = _this.getBeamlineUrl(beamlines, doiData.publiclyAccessibleYear, doiData.resourceType);
-            doiData.mintingYear = doiData.publiclyAccessibleYear;
-        }
+    if (doiData.resourceType === CONSTANTS.DC_RESOURCE_TYPE) {
+      doiData.beamlineUrls = _this.getBeamlineUrl(beamlines, doiData.publiclyAccessibleYear, doiData.resourceType);
+      doiData.mintingYear = doiData.publiclyAccessibleYear;
+    }
 
-        // Create a table containing unique tuples [proposal,  beamline, beamlineUrl]
-        doiData.mergedProposalBeamlines = jsonExtractor.getMergedProposalAndBeamline(proposalNames, beamlines, doiData.beamlineUrls);
+    // Create a table containing unique tuples [proposal,  beamline, beamlineUrl]
+    doiData.mergedProposalBeamlines = jsonExtractor.getMergedProposalAndBeamline(proposalNames, beamlines, doiData.beamlineUrls);
 
-        // Set user specific canonical URL for this page.
-        _this.view.addCanonicalURLToHead('https://doi.esrf.fr/' + doiData.doi);
+    // Set user specific canonical URL for this page.
+    _this.view.addCanonicalURLToHead("https://doi.esrf.fr/" + doiData.doi);
 
-        // send to dust render
-        _this.view.renderDOIData(doiData);
-    }
+    // send to dust render
+    _this.view.renderDOIData(doiData);
+  }
 };
 
 DOIController.prototype.getData = function (doi) {
-    var _this = this;
-
-    this.view.setDOIInTopBanner(doi);
-
-    if (doi.toUpperCase() == "10.15151/ESRF-DC-142893590") {
-        this.render(doi, ESRF_DC_142893590);
-        return;
-    }
-
-    if (doi.toUpperCase() == "10.15151/ESRF-DC-142915526") {
-        this.render(doi, ESRF_DC_142915526);
-        return;
-    }
-
-    if (this.hasAcceptedPrefix(doi)) {
+  var _this = this;
+
+  this.view.setDOIInTopBanner(doi);
+
+  if (doi.toUpperCase() == "10.15151/ESRF-DC-142893590") {
+    this.render(doi, ESRF_DC_142893590);
+    return;
+  }
+
+  if (doi.toUpperCase() == "10.15151/ESRF-DC-142915526") {
+    this.render(doi, ESRF_DC_142915526);
+    return;
+  }
+
+  if (this.hasAcceptedPrefix(doi)) {
+    $.ajax({
+      type: "GET",
+      timeout: 15000, // triggers timeout when request pends longer than
+      // 5000ms
+      url: _this.icatPlusServer + doi + "/json-datacite",
+      beforeSend: function () {
+        try {
+          $("logo").fadeIn().fadeOut().fadeIn().fadeOut().fadeIn().fadeOut();
+        } catch (e) {}
+        _this.view.setLoading("Retrieving data from Server");
+      },
+      complete: function () {
+        _this.view.setLoading(false);
+      },
+    })
+      .done(function (data) {
+        if (data) {
+          _this.render(doi, data);
+        }
+      })
+      .fail(function (jqXHR, textStatus, errorThrown) {
         $.ajax({
-            headers: {
-                Accept: "application/vnd.datacite.datacite+json"
-            },
-            type: "GET",
-            timeout: 15000, // triggers timeout when request pends longer than
-            // 5000ms
-            url: this.doiServer + doi,
-            beforeSend: function () {
-                _this.view.setLoading("Retrieving data from Server");
-            },
-            complete: function () {
-                _this.view.setLoading(false);
-            }
+          headers: {
+            Accept: "application/vnd.datacite.datacite+json",
+          },
+          type: "GET",
+          timeout: 15000, // triggers timeout when request pends longer than
+          // 5000ms
+          url: this.doiServer + doi,
+          beforeSend: function () {
+            _this.view.setLoading("Retrieving data from Server");
+          },
+          complete: function () {
+            _this.view.setLoading(false);
+          },
         })
-            .done(function (data) {
-                if (data) {
-                    _this.render(doi, data);
-                }
-            }).fail(function (jqXHR, textStatus, errorThrown) {
-                /** Try with icat server **/
-                $.ajax({
-                    type: "GET",
-                    timeout: 15000, // triggers timeout when request pends longer than
-                    // 5000ms
-                    url: _this.icatPlusServer + doi + "/json-datacite",
-                    beforeSend: function () {
-                        try {
-                            $("logo").fadeIn().fadeOut().fadeIn().fadeOut().fadeIn().fadeOut();
-                        }
-                        catch (e) { }
-                        _this.view.setLoading("Retrieving data from Server");
-                    },
-                    complete: function () {
-                        _this.view.setLoading(false);
-                    }
-                })
-                    .done(function (data) {
-                        if (data) {
-                            _this.render(doi, data);
-                        }
-                    }).fail(function (jqXHR, textStatus, errorThrown) {
-                        _this.view.renderError(jqXHR, errorThrown, _this.origin);
-                        _this.view.setLoading(false);
-                    });
-
-            });
-        this.getDataForGoogleSearch(doi);
-
-    } else {
-        _this.view.renderError("Bad Prefix", _this.origin);
-    }
+          .done(function (data) {
+            if (data) {
+              _this.render(doi, data);
+            }
+          })
+          .fail(function (jqXHR, textStatus, errorThrown) {
+            _this.view.renderError(jqXHR, errorThrown, _this.origin);
+            _this.view.setLoading(false);
+          });
+      });
+
+    this.getDataForGoogleSearch(doi);
+  } else {
+    _this.view.renderError("Bad Prefix", _this.origin);
+  }
 };
 
 /**
@@ -166,34 +163,34 @@ DOIController.prototype.getData = function (doi) {
  * @param {string} doi in the format prefix/suffix
  */
 DOIController.prototype.getDataForGoogleSearch = function (doi) {
-    var _this = this;
-    if (doi) {
-        $.ajax({
-            headers: {
-                Accept: "application/vnd.schemaorg.ld+json"
-            },
-            type: "GET",
-            timeout: 15000,
-            url: this.contentNegociationServer + doi,
-            //dataType: 'text', // don't convert JSON to Javascript object
-            success: function (data) {
-                if (data) {
-                    googleMetadataObject = new GoogleMetadataObject(data);
-                    googleMetadataObject.setDescription();
-                    googleMetadataObject.setLicense();
-                    googleMetadataObject.setPublisherLogo();
-
-                    _this.view.addDOIMetadataToHead(JSON.stringify(googleMetadataObject.getMetadata()));
-                } else {
-                    console.log("[GOOGLE SEARCH INDEXING] - No metadata recieved from datacite.");
-                }
-            },
-            error: function (error) {
-                console.log("[GOOGLE SEARCH INDEXING] - Failed getting metadata from datacite.");
-                console.log(error.responseJSON);
-            }
-        });
-    }
+  var _this = this;
+  if (doi) {
+    $.ajax({
+      headers: {
+        Accept: "application/vnd.schemaorg.ld+json",
+      },
+      type: "GET",
+      timeout: 15000,
+      url: this.contentNegociationServer + doi,
+      //dataType: 'text', // don't convert JSON to Javascript object
+      success: function (data) {
+        if (data) {
+          googleMetadataObject = new GoogleMetadataObject(data);
+          googleMetadataObject.setDescription();
+          googleMetadataObject.setLicense();
+          googleMetadataObject.setPublisherLogo();
+
+          _this.view.addDOIMetadataToHead(JSON.stringify(googleMetadataObject.getMetadata()));
+        } else {
+          console.log("[GOOGLE SEARCH INDEXING] - No metadata recieved from datacite.");
+        }
+      },
+      error: function (error) {
+        console.log("[GOOGLE SEARCH INDEXING] - Failed getting metadata from datacite.");
+        console.log(error.responseJSON);
+      },
+    });
+  }
 };
 
 /**
@@ -202,76 +199,77 @@ DOIController.prototype.getDataForGoogleSearch = function (doi) {
  * @return true if the prefix is an esrf prefix, false otherwise
  */
 DOIController.prototype.hasAcceptedPrefix = function (doi) {
-    var prefix = doi.split('/')[0];
-    return (_.findIndex(this.acceptedPrefix, function (o) {
-        return prefix == o;
-    }) != -1);
+  var prefix = doi.split("/")[0];
+  return (
+    _.findIndex(this.acceptedPrefix, function (o) {
+      return prefix == o;
+    }) != -1
+  );
 };
 
 // Selects what will be displayed in the main id div
 DOIController.prototype.displayMainContent = function (doi) {
-    var isDOIProvided = false;
+  var isDOIProvided = false;
 
-    if (this.origin === "welcome-page") {
-        dust.render('welcome_tpl', {}, function (err, out) {
-            $("#main").html(out);
-        });
-    }
-    if (this.origin === "index") {
-        this.getData(doi);
-    }
+  if (this.origin === "welcome-page") {
+    dust.render("welcome_tpl", {}, function (err, out) {
+      $("#main").html(out);
+    });
+  }
+  if (this.origin === "index") {
+    this.getData(doi);
+  }
 };
 
 /**
  * Set the origin from where the DOI controller is created. This affects the
  * content of error messages for example depending on whether they are displayed
  * in the "welcome-page" content or the "doi landing page" content.
- * 
+ *
  * @param {string}
  *                origin The origin page this call is made from
  */
 DOIController.prototype.setOrigin = function (origin) {
-    this.origin = origin;
+  this.origin = origin;
 };
 
 /**
-* Get the corresponding url for a given beamline name
-* @param {array} beamlines The beamlines
-* @param {momentJS} date The date the experiment was performed.
-* @param {String} resourceType the data resource type
-* @return {array} an array containing urls of the beamLine(s). 
-*/
+ * Get the corresponding url for a given beamline name
+ * @param {array} beamlines The beamlines
+ * @param {momentJS} date The date the experiment was performed.
+ * @param {String} resourceType the data resource type
+ * @return {array} an array containing urls of the beamLine(s).
+ */
 DOIController.prototype.getBeamlineUrl = function (beamlines, date, resourceType) {
-    var result = [];
-    beamlines.forEach(function (beamline) {
-        if (date) {
-            if (resourceType === CONSTANTS.ES_RESOURCE_TYPE) {
-                date = moment(date);
-            }
-            if (resourceType === CONSTANTS.DC_RESOURCE_TYPE) {
-                date = moment(date, "YYYY");
-            }
-
-            var foundUrl = "";
-            for (var i = 0; i < BEAMLINEURL.length; i++) {
-                var startDate = moment(BEAMLINEURL[i].startDate);
-                var endDate = moment(BEAMLINEURL[i].endDate);
-                if (BEAMLINEURL[i].name.toLowerCase() === beamline.toLowerCase() && date >= startDate && date <= endDate) {
-                    foundUrl = BEAMLINEURL[i].url;
-                    break;
-                }
-            }
-            if (foundUrl === "") {
-                result.push("noLink");
-            } else {
-                result.push(foundUrl);
-            }
-
-        } else {
-            result.push("noLink");
+  var result = [];
+  beamlines.forEach(function (beamline) {
+    if (date) {
+      if (resourceType === CONSTANTS.ES_RESOURCE_TYPE) {
+        date = moment(date);
+      }
+      if (resourceType === CONSTANTS.DC_RESOURCE_TYPE) {
+        date = moment(date, "YYYY");
+      }
+
+      var foundUrl = "";
+      for (var i = 0; i < BEAMLINEURL.length; i++) {
+        var startDate = moment(BEAMLINEURL[i].startDate);
+        var endDate = moment(BEAMLINEURL[i].endDate);
+        if (BEAMLINEURL[i].name.toLowerCase() === beamline.toLowerCase() && date >= startDate && date <= endDate) {
+          foundUrl = BEAMLINEURL[i].url;
+          break;
         }
-    });
-    return result;
+      }
+      if (foundUrl === "") {
+        result.push("noLink");
+      } else {
+        result.push(foundUrl);
+      }
+    } else {
+      result.push("noLink");
+    }
+  });
+  return result;
 };
 
 /**
@@ -281,18 +279,29 @@ DOIController.prototype.getBeamlineUrl = function (beamlines, date, resourceType
  * @return {string} the citation to be displayed
  */
 DOIController.prototype.createCitation = function (doiData) {
-    // Authors sent in json can be in several format. The following call find
-    // first name and last name when possible.
-    var citation = new Citation(doiData);
-
-    if (!citation.isBuildable) {
-        return "The citation could not be generated.";
-
-    } else {
-        var authorInCitation = citation.getAuthorsForCitation(doiData.creators);
-        var doiRegistrationYear = citation.getDOIRegistrationYear(doiData);
-        var fullCitation = authorInCitation + ' (' + doiRegistrationYear + '). ' + doiData.title + '. ' + doiData.publisher + ' (ESRF). ' +
-            " <a href='https://doi.esrf.fr/" + doiData.doi + "'> doi:" + doiData.doi.toUpperCase() + "</a>";
-        return fullCitation;
-    }
+  // Authors sent in json can be in several format. The following call find
+  // first name and last name when possible.
+  var citation = new Citation(doiData);
+
+  if (!citation.isBuildable) {
+    return "The citation could not be generated.";
+  } else {
+    var authorInCitation = citation.getAuthorsForCitation(doiData.creators);
+    var doiRegistrationYear = citation.getDOIRegistrationYear(doiData);
+    var fullCitation =
+      authorInCitation +
+      " (" +
+      doiRegistrationYear +
+      "). " +
+      doiData.title +
+      ". " +
+      doiData.publisher +
+      " (ESRF). " +
+      " <a href='https://doi.esrf.fr/" +
+      doiData.doi +
+      "'> doi:" +
+      doiData.doi.toUpperCase() +
+      "</a>";
+    return fullCitation;
+  }
 };

www/src/doiview.js

@@ -166,6 +166,8 @@ DOIView.prototype.renderMetadata = function (data) {
  * @return {string} message to display                
  */
 DOIView.prototype.setDataAccessMessage = function (doiData) {
+alert("test");
+    console.log(doiData);
     if (doiData.accessibility === "Open access") {
         return "The data can be accessed by clicking on the link below";
     } else if (doiData.accessibility === "Restricted access") {
@@ -195,4 +197,4 @@ DOIView.prototype.addCanonicalURLToHead = function (doiURL) {
         .attr('rel', 'canonical')
         .attr('href', doiURL)
         .appendTo('head');
-};
+};
\ No newline at end of file