From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 7 Sep 2011 12:38:24 +0000 (+0200)
Subject: zoom: new target profile setting: sortmap_field
X-Git-Tag: v1.3.10~1
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=30b0943d4387c7a70dd0095503eca7c9721dfa9c;hp=b716eaa867855acf7695856f4214e6b206acd947;p=metaproxy-moved-to-github.git

zoom: new target profile setting: sortmap_field

If sortmap_field is given the field is mapped to the value for the
sortmap. Values not matching sortmap_field are passed verbatim.
---

diff --git a/etc/config-zoom.xml b/etc/config-zoom.xml
index 451ceb3..96ed5b8 100644
--- a/etc/config-zoom.xml
+++ b/etc/config-zoom.xml
@@ -47,6 +47,7 @@
 	    <transform>tmarc.xsl</transform>
 	    <zurl>localhost:9998/db01</zurl>
             <sortStrategy>embed</sortStrategy>
+            <sortmap_title>dc.title</sortmap_title>
 	  </record>
 
           <!-- jstor1 -->
diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index de2c0b2..1e013eb 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -47,6 +47,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/zgdu.h>
 #include <yaz/querytowrbuf.h>
 #include <yaz/sortspec.h>
+#include <yaz/tokenizer.h>
 
 namespace mp = metaproxy_1;
 namespace yf = mp::filter;
@@ -74,6 +75,7 @@ namespace metaproxy_1 {
             bool use_turbomarc;
             bool piggyback;
             CCL_bibset ccl_bibset;
+            std::map<std::string, std::string> sortmap;
             Searchable(CCL_bibset base);
             ~Searchable();
         };
@@ -473,6 +475,12 @@ yf::Zoom::SearchablePtr yf::Zoom::Impl::parse_torus_record(const xmlNode *ptr)
             ccl_qual_fitem(s->ccl_bibset, value.c_str(),
                            (const char *) ptr->name + 7);
         }
+        else if (!strncmp((const char *) ptr->name,
+                          "sortmap_", 8))
+        {
+            std::string value = mp::xml::get_text(ptr);
+            s->sortmap[(const char *) ptr->name + 8] = value;
+        }
         else if (!strcmp((const char *) ptr->name,
                           "sortStrategy"))
         {
@@ -1355,9 +1363,41 @@ void yf::Zoom::Frontend::handle_search(mp::Package &package)
             WRBUF sort_spec_wrbuf = wrbuf_alloc();
             yaz_srw_sortkeys_to_sort_spec(wrbuf_cstr(sru_sortkeys_wrbuf),
                                           sort_spec_wrbuf);
-            sortkeys.assign(wrbuf_cstr(sort_spec_wrbuf));
-            wrbuf_destroy(sort_spec_wrbuf);
             wrbuf_destroy(sru_sortkeys_wrbuf);
+
+            yaz_tok_cfg_t tc = yaz_tok_cfg_create();
+            yaz_tok_parse_t tp =
+                yaz_tok_parse_buf(tc, wrbuf_cstr(sort_spec_wrbuf));
+            yaz_tok_cfg_destroy(tc);
+
+            /* go through sortspec and map fields */
+            int token = yaz_tok_move(tp);
+            while (token != YAZ_TOK_EOF)
+            {
+                if (token == YAZ_TOK_STRING)
+                {
+                    const char *field = yaz_tok_parse_string(tp);
+                    std::map<std::string,std::string>::iterator it;
+                    it = b->sptr->sortmap.find(field);
+                    if (it != b->sptr->sortmap.end())
+                        sortkeys += it->second;
+                    else
+                        sortkeys += field;
+                }
+                sortkeys += " ";
+                token = yaz_tok_move(tp);
+                if (token == YAZ_TOK_STRING)
+                {
+                    sortkeys += yaz_tok_parse_string(tp);
+                }
+                if (token != YAZ_TOK_EOF)
+                {
+                    sortkeys += " ";
+                    token = yaz_tok_move(tp);
+                }
+            }
+            yaz_tok_parse_destroy(tp);
+            wrbuf_destroy(sort_spec_wrbuf);
         }
         cql_parser_destroy(cp);
         if (r)
diff --git a/xml/schema/filter_zoom.rnc b/xml/schema/filter_zoom.rnc
index d8df770..144efd1 100644
--- a/xml/schema/filter_zoom.rnc
+++ b/xml/schema/filter_zoom.rnc
@@ -36,7 +36,10 @@ filter_zoom =
         element mp:cfProxy { xsd:string }?,
         element mp:cfSubDb { xsd:string }?,
         element mp:contentConnector { xsd:string }?,
-        element mp:sortStrategy { xsd:string }?
+        element mp:sortStrategy { xsd:string }?,
+        element mp:sortmap_author { xsd:string }?,
+        element mp:sortmap_date { xsd:string }?,
+        element mp:sortmap_title { xsd:string }?
       }*
     }?
   }?,