From: Mike Taylor <mike@indexdata.com>
Date: Fri, 28 Jun 2013 09:00:46 +0000 (+0200)
Subject: Simplify renderDetails(), eliminating repetition of HTML boilerplate.
X-Git-Tag: 0.9.1~425
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=f19fe8fd7a7ec7405272654995aeb07cfdb70c2e

Simplify renderDetails(), eliminating repetition of HTML boilerplate.
---

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 6bc3a30..c97464d 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -442,30 +442,39 @@ function renderDetails(data, marker)
 {
     var details = '<div class="details" id="det_'+data.recid+'"><table>';
     if (marker) details += '<tr><td>'+ marker + '</td></tr>';
-    if (data["md-title"] != undefined) {
-        details += '<tr><td><b>' + M('Title') + '</b></td><td><b>:</b> '+data["md-title"];
-  	if (data["md-title-remainder"] !== undefined) {
-	      details += ' : <span>' + data["md-title-remainder"] + ' </span>';
-  	}
-  	if (data["md-title-responsibility"] !== undefined) {
-	      details += ' <span><i>'+ data["md-title-responsibility"] +'</i></span>';
-  	}
- 	  details += '</td></tr>';
-    }
-    if (data["md-date"] != undefined)
-        details += '<tr><td><b>' + M('Date') + '</b></td><td><b>:</b> ' + data["md-date"] + '</td></tr>';
-    if (data["md-author"] != undefined)
-        details += '<tr><td><b>' + M('Author') + '</b></td><td><b>:</b> ' + data["md-author"] + '</td></tr>';
-    if (data["md-electronic-url"] != undefined)
-        details += '<tr><td><b>URL</b></td><td><b>:</b> <a href="' + data["md-electronic-url"] + '" target="_blank">' + data["md-electronic-url"] + '</a>' + '</td></tr>';
-    if (data["location"][0]["md-subject"] != undefined)
-        details += '<tr><td><b>' + M('Subject') + '</b></td><td><b>:</b> ' + data["location"][0]["md-subject"] + '</td></tr>';
-    if (data["location"][0]["@name"] != undefined)
-        details += '<tr><td><b>' + M('Location') + '</b></td><td><b>:</b> ' + data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")" + '</td></tr>';
+
+    details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
+    details += renderField("Date", data["md-date"]);
+    details += renderField("Author", data["md-author"]);
+    details += renderField("URL", data["md-electronic-url"]);
+    details += renderField("Subject", data["location"][0]["md-subject"]);
+    details += renderField("Location", data["location"][0]["@name"], data["location"][0]["@id"]);
     details += '</table></div>';
+
     return details;
 }
 
+function renderField(caption, data, data2, data3) {
+    if (data === undefined) {
+	return "";
+    }
+
+    if (caption == "URL") {
+	data = '<a href="' + data + '" target="_blank">' + data + '</a>';
+    }
+
+    if (data2 != undefined) {
+	data = data + " (" + data2 + ")";
+    }
+
+    if (data3 != undefined) {
+	data = data + " <i>" + data3 + "</i>";
+    }
+
+    return '<tr><td><b>' + M(caption) + '</b></td><td><b>:</b> ' + data + '</td></tr>';
+}
+
+
 /*
  * All the HTML stuff to render the search forms and
  * result pages.