fixed for subjectheadings and works

Author: StiftungAusNachlass

src/updater/gndUpdater.js

@@ -99,16 +99,18 @@ main = (payload) => {
             let requests = [];
 
             URIList.forEach((uri) => {
-                var gndURIParts = uri.split('/');
-                let gndID = gndURIParts.pop();
-                let dataRequestUrl = `https://uri.gbv.de/terminology/entityfacts/${gndID}?format=json`
-                let dataRequest = fetch(dataRequestUrl);
-                requests.push({
-                    url: dataRequestUrl,
-                    uri: uri,
-                    request: dataRequest
-                });
-                requestUrls.push(dataRequest);
+                if(uri) {
+                    var gndURIParts = uri.split('/');
+                    let gndID = gndURIParts.pop();
+                    let dataRequestUrl = `https://uri.gbv.de/terminology/entityfacts/${gndID}?format=json`
+                    let dataRequest = fetch(dataRequestUrl);
+                    requests.push({
+                        url: dataRequestUrl,
+                        uri: uri,
+                        request: dataRequest
+                    });
+                    requestUrls.push(dataRequest);
+                }
             });
 
             Promise.all(requestUrls).then(function (responses) {
@@ -168,8 +170,8 @@ main = (payload) => {
                             // get desired language for preflabel. This is frontendlanguage from original data...
                             let desiredLanguage = originalCdata.frontendLanguage;
                             // lock in save data
-                            newCdata.conceptURI = data['@id'];
-                            newCdata.conceptName = data.preferredName;
+                            newCdata.conceptURI = data['@id'] ?? originalCdata.conceptURI;
+                            newCdata.conceptName = data.preferredName ?? originalCdata.conceptName;
 
                             // if no frontendLanguage exists in originalData: add
                             if (!originalCdata?.frontendLanguage?.length == 2) {
@@ -188,7 +190,7 @@ main = (payload) => {
                             }
 
                             newCdata._fulltext = {}
-                            newCdata._fulltext.text = GNDUtil.getFullTextFromEntityFactsJSON(data, info?.config?.plugin?.['custom-data-type-gnd']?.config);
+                            newCdata._fulltext.text = GNDUtil.getFullTextFromEntityFactsJSON(data, newCdata, info?.config?.plugin?.['custom-data-type-gnd']?.config);
 
 
                             if (hasChanges(payload.objects[index].data, newCdata)) {

src/webfrontend/CustomDataTypeGND.coffee

@@ -315,9 +315,12 @@ class CustomDataTypeGND extends CustomDataTypeWithCommonsAsPlugin
               extendedInfo_xhr = new (CUI.XHR)(url: xurl)
               extendedInfo_xhr.start()
               .done((data, status, statusText) ->
+                # note: subjectheadings and works are not part of entityfacts yet
+                # --> data will be empty, which is handled by falling back to cdata-defaults from autocomplete
+
                 pluginConfig = ez5.session.getBaseConfig("plugin", "custom-data-type-gnd")
 
-                cdata.conceptURI = data['@id']
+                cdata.conceptURI = data['@id'] ? cdata.conceptURI
 
                 databaseLanguages = that.getDatabaseLanguages()
 
@@ -330,7 +333,7 @@ class CustomDataTypeGND extends CustomDataTypeWithCommonsAsPlugin
                     cdata.conceptGeoJSON = geoJSON
 
                 cdata._fulltext =
-                  text: GNDUtil.getFullTextFromEntityFactsJSON(data, pluginConfig)
+                  text: GNDUtil.getFullTextFromEntityFactsJSON(data, cdata, pluginConfig)
               )
 
               .always(() ->

src/webfrontend/GNDUtil.coffee

@@ -48,24 +48,33 @@ class GNDUtil
       return false
 
 
-  @getFullTextFromEntityFactsJSON: (efJSON, pluginConfig) ->
+  @getFullTextFromEntityFactsJSON: (efJSON, cdata, pluginConfig) ->
     _fulltext = ''
 
     if not pluginConfig?.fulltext_gnd
       return _fulltext
     fulltextConfig = pluginConfig.fulltext_gnd
 
     # changed: lobid used 'id', entityfacts uses '@id'
-    if efJSON['@id'] and fulltextConfig?.id
-      _fulltext += efJSON['@id'] + ' '
+    if fulltextConfig?.id
+      if efJSON['@id'] and 
+        _fulltext += efJSON['@id'] + ' '
+      else
+        _fulltext += cdata.conceptURI + ' '
 
     # missing in entityfacts: gndIdentifier, replace with derivative of @id
-    if efJSON['@id'] and fulltextConfig?.gndIdentifier
-      _fulltext += efJSON['@id'].split('/').at(-1) + ' '
+    if fulltextConfig?.gndIdentifier
+      if efJSON['@id'] 
+        _fulltext += efJSON['@id'].split('/').at(-1) + ' '
+      else 
+        _fulltext += cdata.conceptURI.split('/').at(-1) + ' '
 
     # same in both: preferredName
-    if efJSON?.preferredName and fulltextConfig?.preferredName
-      _fulltext += efJSON.preferredName + ' '
+    if fulltextConfig?.preferredName
+      if efJSON?.preferredName and 
+        _fulltext += efJSON.preferredName + ' '
+      else 
+        _fulltext += cdata.conceptName + ' '
 
     # same in both: variantName
     if efJSON?.variantName and fulltextConfig?.variantName