From: Heikki Levanto <heikki@indexdata.dk>
Date: Tue, 21 Jul 2015 08:33:42 +0000 (+0200)
Subject: Have a simple fix
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=237adf1a78caad95966560c9efdba05c485c9ac2;p=pazpar2-moved-to-github.git

Have a simple fix
---

diff --git a/doc/common b/doc/common
index f6a5ec8..6cdcfde 160000
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit f6a5ec8c243e2a6829a2917cb30c849612d6fd01
+Subproject commit 6cdcfde2c770531a571d755ed070059ee7ab4fc9
diff --git a/src/client.c b/src/client.c
index e1e8d6f..6e84061 100644
--- a/src/client.c
+++ b/src/client.c
@@ -778,6 +778,10 @@ int client_has_facet(struct client *cl, const char *name)
     for (s = sdb->settings[PZ_FACETMAP]; s; s = s->next)
     {
         const char *p = strchr(s->name + 3, ':');
+        if ( !strncmp(p, ":split:", 7) )
+            p += 6; // PAZ-1009
+        yaz_log(YLOG_DEBUG, "client_has_facet: '%s' '%s' '%s' ",
+                name, s->name, p);
         if (p && !strcmp(name, p + 1))
             return 1;
     }
diff --git a/test/paz_1009-b.sh b/test/paz_1009-b.sh
index 0f6b048..d28d70b 100755
--- a/test/paz_1009-b.sh
+++ b/test/paz_1009-b.sh
@@ -59,13 +59,16 @@ curl "localhost:9763?session=1&command=bytarget&block=1"
 echo; echo
 
 echo "Second Search"
-curl "localhost:9763?session=1&command=search&query=water&limit=publisher=U.S. G.P.O"
+curl "localhost:9763?session=1&command=search&query=water&limit=publisher%3DU.S.%20G.P.O"
 echo; echo
 
 echo "Bytarget"
 curl "localhost:9763?session=1&command=bytarget&block=1"
 echo; echo
 
+echo "Termlist"
+curl "localhost:9763?session=1&command=termlist&name=xtargets%2Cseries%2Cpublisher"
+echo; echo
 
 # Kill PZ2
 kill $PZ2PID
diff --git a/test/paz_1009_service4.xml b/test/paz_1009_service4.xml
index 45db469..21f2084 100644
--- a/test/paz_1009_service4.xml
+++ b/test/paz_1009_service4.xml
@@ -145,11 +145,13 @@
       <metadata name="series_title"/>
       <metadata brief="yes" merge="range" name="date" sortkey="numeric" termlist="yes" type="year"/>
       <metadata brief="yes" merge="longest" name="publisher" termlist="yes"/>
+      <!--metadata brief="yes" merge="longest" name="publisher" /-->
       <metadata name="name_subject"/>
       <metadata name="title_subject"/>
       <metadata brief="yes" merge="longest" name="note"/>
       <metadata name="subject" termlist="yes"/>
       <metadata name="series" termlist="yes"/>
+      <!--metadata name="series"/-->
       <metadata name="language" termlist="yes"/>
       <metadata name="audiencelevel" termlist="yes"/>
       <metadata brief="yes" name="brief-156"/>
@@ -3342,6 +3344,7 @@
         <set name="pz:cclmap:FromPubYear" target="1986913" value="u=q_FromPubYear"/>
         <set name="pz:cclmap:PUBLISHER-NUMBER" target="1986913" value="u=PUBLISHER_NUMBER"/>
         <set name="pz:facetmap:split:series" target="1986913" value="facet_17"/>
+        <!--set name="pz:facetmap:series" target="1986913" value="facet_17"/-->
         <set name="pz:limitmap:medium" target="1986913" value="ccl:medium"/>
         <set name="pz:cclmap:READING-PROGRAM-NAME" target="1986913" value="u=READING_PROGRAM_NAME"/>
         <set name="pz:cclmap:NLC-NUMBER" target="1986913" value="u=NLC_NUMBER"/>