Frontend support for TS settings & customize LemmaSugg URL (re #48)

comphist · Apr 5, 2017 · b72e040 · b72e040
1 parent 533699f
commit b72e040
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/src/db/migration/5-to-6.sql b/src/db/migration/5-to-6.sql
@@ -23,4 +23,8 @@
 
 LOCK TABLES `tagset` WRITE;
 ALTER TABLE `tagset` ADD COLUMN `settings` text DEFAULT NULL;
+
+-- preserve old default behaviour
+UPDATE `tagset` SET `settings`='{"url_with_id": "http://www.woerterbuchnetz.de/DWB?lemid={value}", "url_with_lemma": "http://www.woerterbuchnetz.de/DWB?lemma={value}"}' WHERE `class`="lemma_sugg";
+
 UNLOCK TABLES;
diff --git a/src/gui/js/tagsets/LemmaSugg.js b/src/gui/js/tagsets/LemmaSugg.js
@@ -32,7 +32,6 @@ var LemmaSuggTagset = new Class({
     eventString: 'click:relay(div.editTableLemmaLink)',
     searchable: false,
     exportable: false,
-    baseURL: "http://www.woerterbuchnetz.de/DWB",
     windowTarget: "coraExternalLemmaLink",
 
     /* Constructor: Tagset
@@ -98,14 +97,22 @@ var LemmaSuggTagset = new Class({
        Opens a link to an external website.
      */
     openExternalLemmaLink: function(value) {
-        var split, targetURL = this.baseURL;
-        if (typeof(value) !== "undefined" && value !== null) {
+        var split, targetURL = null;
+        if (this.settings && typeof(value) !== "undefined" && value !== null) {
             split = this._acSplitExternalId(value);
-            if(split[1].length > 0)
-                targetURL = targetURL + "?lemid=" + split[1];
-            else
-                targetURL = targetURL + "?lemma=" + split[0];
+            if(split[1].length > 0) {
+                if(this.settings['url_with_id'])
+                    targetURL = this.settings['url_with_id'].substitute({value: split[1]});
+            }
+            else {
+                if(this.settings['url_with_lemma'])
+                    targetURL = this.settings['url_with_lemma'].substitute({value: split[0]});
+            }
+        }
+        if(targetURL) {
+            window.open(targetURL, this.windowTarget);
+        } else {
+            gui.showNotice('error', _("Banner.tagsetLemmaSuggNoURL"));
         }
-        window.open(targetURL, this.windowTarget);
     }
 });
diff --git a/src/gui/js/tagsets/Tagset.js b/src/gui/js/tagsets/Tagset.js
@@ -72,6 +72,7 @@ var Tagset = new Class({
     exportable: true,  /**< can user export this tagset in CSV format? */
     split_class: false,  /**< is this tagset displayed as two? */
     value_key: '',  /**< defaults to "anno_" + class */
+    settings: null,  /**< tagset-specific settings as defined in the database */
 
     tags: [],
     processed: false,
@@ -100,6 +101,9 @@ var Tagset = new Class({
             this.class = data.class;
             this.value_key = "anno_" + this.class;
         }
+        if(typeof(data.settings) !== "undefined" && data.settings) {
+            this.settings = JSON.parse(data.settings);
+        }
     },
 
     /* Function: setShowInputErrors

diff --git a/src/locale/Locale.de-DE.json b/src/locale/Locale.de-DE.json
@@ -207,6 +207,7 @@
             "taggerDeleted": "Tagger gel\u00f6scht.",
             "taggerOptionsUpdated": "Tagger-Optionen ge\u00e4ndert.",
             "tagsetsChanged": "Tagset-Verkn\u00fcpfungen ge\u00e4ndert.",
+            "tagsetLemmaSuggNoURL": "Keine URL f\u00fcr den Lemma-Link eingestellt!",
             "transcriptionEmpty": "Transkription darf nicht leer sein!",
             "userAdded": "Benutzer hinzugef\u00fcgt.",
             "userDeleted": "Benutzer gel\u00f6scht.",

diff --git a/src/locale/Locale.en-US.json b/src/locale/Locale.en-US.json
@@ -207,6 +207,7 @@
             "taggerDeleted": "Tagger successfully deleted.",
             "taggerOptionsUpdated": "Tagger options updated successfully.",
             "tagsetsChanged": "Applied tagset settings.",
+            "tagsetLemmaSuggNoURL": "No URL defined for external lemma link!",
             "transcriptionEmpty": "Please enter a transcription!",
             "userAdded": "User added.",
             "userDeleted": "User successfully deleted.",