From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 7 Jan 2014 12:47:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.38~3
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=5ff4a545337696359ee78f70c6612484af8bc3bf;hp=73d850607f4b24e591405c59b2accd475d73c054;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
---

diff --git a/src/session.c b/src/session.c
index d965d75..6d7ab65 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1459,8 +1459,11 @@ static struct record_metadata *record_metadata_init(
     {
     case Metadata_type_generic:
     case Metadata_type_skiparticle:
-        rec_md->data.text.disp =
-            normalize7bit_generic(nmem_strdup(nmem, value), " ,/.:([");
+        if (strstr(value, "://")) /* looks like a URL */
+            rec_md->data.text.disp = nmem_strdup(nmem, value);
+        else
+            rec_md->data.text.disp =
+                normalize7bit_generic(nmem_strdup(nmem, value), " ,/.:([");
         rec_md->data.text.sort = 0;
         rec_md->data.text.snippet = 0;
         break;
diff --git a/test/test_cluster.cfg b/test/test_cluster.cfg
index 6b99b2f..e36a149 100644
--- a/test/test_cluster.cfg
+++ b/test/test_cluster.cfg
@@ -39,6 +39,7 @@
       <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
 		termlist="yes"/>
       <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6" mergekey="required" />
+      <metadata name="url" brief="yes" />
     </service>
   </server>
 </pazpar2>
diff --git a/test/test_cluster.pz.1.xml b/test/test_cluster.pz.1.xml
index a59aaa0..f3a2212 100644
--- a/test/test_cluster.pz.1.xml
+++ b/test/test_cluster.pz.1.xml
@@ -4,6 +4,7 @@
  <metadata type="medium">book</metadata>
  <metadata type="date">1995</metadata>
  <metadata type="title">How to program a computer vol1</metadata>
+ <metadata type="url">http://www.indexdata.com/pazpar2/</metadata>
 </record>
 <record xmlns="http://www.indexdata.com/pazpar2/1.0">
  <metadata type="author">Jack Collins</metadata>
diff --git a/test/test_cluster.pz.3.xml b/test/test_cluster.pz.3.xml
index ffdf34e..20e238f 100644
--- a/test/test_cluster.pz.3.xml
+++ b/test/test_cluster.pz.3.xml
@@ -3,4 +3,5 @@
  <metadata type="medium">book</metadata>
  <metadata type="date">1995</metadata>
  <metadata type="title">How to program a computer vol1</metadata>
+ <metadata type="url">http://www.indexdata.com/pazpar2/</metadata>
 </record>
diff --git a/test/test_cluster_3.res b/test/test_cluster_3.res
index 2f88c6a..fc17176 100644
--- a/test/test_cluster_3.res
+++ b/test/test_cluster_3.res
@@ -16,6 +16,7 @@
   <md-medium>book</md-medium>
   <md-date>1995</md-date>
   <md-title>How to program a computer vol1</md-title>
+  <md-url>http://www.indexdata.com/pazpar2/</md-url>
  </location>
  <location id="localhost:9999"
     name="ztest" checksum="1993510496">
diff --git a/test/test_cluster_5.res b/test/test_cluster_5.res
index 6da9672..8acb6a7 100644
--- a/test/test_cluster_5.res
+++ b/test/test_cluster_5.res
@@ -16,6 +16,7 @@
   <md-medium>book</md-medium>
   <md-date>1995</md-date>
   <md-title>How to program a computer vol1</md-title>
+  <md-url>http://www.indexdata.com/pazpar2/</md-url>
  </location>
  <location id="localhost:9999"
     name="ztest" checksum="1993510496">
diff --git a/test/test_cluster_7.res b/test/test_cluster_7.res
index d616b21..ae04e2a 100644
--- a/test/test_cluster_7.res
+++ b/test/test_cluster_7.res
@@ -16,6 +16,7 @@
   <md-medium>book</md-medium>
   <md-date>1995</md-date>
   <md-title>How to program a computer vol1</md-title>
+  <md-url>http://www.indexdata.com/pazpar2/</md-url>
  </location>
  <location id="localhost:9999"
     name="ztest" checksum="1993510496">
diff --git a/test/test_cluster_9.res b/test/test_cluster_9.res
index d47758f..fd01649 100644
--- a/test/test_cluster_9.res
+++ b/test/test_cluster_9.res
@@ -16,6 +16,7 @@
   <md-medium>book</md-medium>
   <md-date>1995</md-date>
   <md-title>How to program a computer vol1</md-title>
+  <md-url>http://www.indexdata.com/pazpar2/</md-url>
  </location>
  <location id="localhost:9999"
     name="ztest" checksum="1993510496">
@@ -29,7 +30,7 @@
   <md-author>Jack Collins</md-author>
   <md-medium>book</md-medium>
   <md-date>1995</md-date>
-  <md-title>How to program a computer vol4</md-title>
+  <md-title>How to program a computer vol1</md-title>
  </location>
  <location id="localhost:9999"
     name="ztest" checksum="1482143625">