X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Futil.cpp;h=f792e02ddc12ae18a85d5382f3115118656408f3;hb=2a22abb08a31fd2ce7343b26fdcb045bd8e42199;hp=c615811aa0e82155c570758895045e3a40954fa7;hpb=6c0c08aa87abd3698c7a2dab55628cbbe788659c;p=metaproxy-moved-to-github.git

diff --git a/src/util.cpp b/src/util.cpp
index c615811..f792e02 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,17 +1,30 @@
-/* $Id: util.cpp,v 1.28 2007-04-16 21:54:52 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 Index Data
 
-   See the LICENSE file for details
- */
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 
 #include <yaz/odr.h>
 #include <yaz/pquery.h>
 #include <yaz/otherinfo.h>
 #include <yaz/querytowrbuf.h>
 #include <yaz/oid_db.h>
+#include <yaz/srw.h>
 
 #include <iostream>
 
@@ -149,11 +162,53 @@ std::string mp_util::database_name_normalize(const std::string &s)
 
 }
 
+void mp_util::piggyback_sr(Z_SearchRequest *sreq,
+                           Odr_int result_set_size,
+                           Odr_int &number_to_present,
+                           const char **element_set_name)
+{
+    Z_ElementSetNames *esn;
+    const char *smallSetElementSetNames = 0;
+    const char *mediumSetElementSetNames = 0;
+
+    esn = sreq->smallSetElementSetNames;
+    if (esn && esn->which == Z_ElementSetNames_generic)
+        smallSetElementSetNames = esn->u.generic;
+
+    esn = sreq->mediumSetElementSetNames;
+    if (esn && esn->which == Z_ElementSetNames_generic)
+        mediumSetElementSetNames = esn->u.generic;
+
+    piggyback(*sreq->smallSetUpperBound,
+              *sreq->largeSetLowerBound,
+              *sreq->mediumSetPresentNumber,
+              smallSetElementSetNames,
+              mediumSetElementSetNames,
+              result_set_size,
+              number_to_present,
+              element_set_name);
+}
+
 void mp_util::piggyback(int smallSetUpperBound,
-                                  int largeSetLowerBound,
-                                  int mediumSetPresentNumber,
-                                  int result_set_size,
-                                  int &number_to_present)
+                        int largeSetLowerBound,
+                        int mediumSetPresentNumber,
+                        int result_set_size,
+                        int &number_to_present)
+{
+    Odr_int tmp = number_to_present;
+    piggyback(smallSetUpperBound, largeSetLowerBound, mediumSetPresentNumber,
+              0, 0, result_set_size, tmp, 0);
+    number_to_present = tmp;
+}
+
+void mp_util::piggyback(Odr_int smallSetUpperBound,
+                        Odr_int largeSetLowerBound,
+                        Odr_int mediumSetPresentNumber,
+                        const char *smallSetElementSetNames,
+                        const char *mediumSetElementSetNames,
+                        Odr_int result_set_size,
+                        Odr_int &number_to_present,
+                        const char **element_set_name)
 {
     // deal with piggyback
 
@@ -161,11 +216,16 @@ void mp_util::piggyback(int smallSetUpperBound,
     {
         // small set . Return all records in set
         number_to_present = result_set_size;
+        if (element_set_name && smallSetElementSetNames)
+            *element_set_name = smallSetElementSetNames;
+            
     }
     else if (result_set_size > largeSetLowerBound)
     {
         // large set . Return no records
         number_to_present = 0;
+        if (element_set_name)
+            *element_set_name = 0;
     }
     else
     {
@@ -173,10 +233,11 @@ void mp_util::piggyback(int smallSetUpperBound,
         number_to_present = mediumSetPresentNumber;
         if (number_to_present > result_set_size)
             number_to_present = result_set_size;
+        if (element_set_name && mediumSetElementSetNames)
+            *element_set_name = mediumSetElementSetNames;
     }
 }
 
-
 bool mp_util::pqf(ODR odr, Z_APDU *apdu, const std::string &q)
 {
     YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
@@ -466,6 +527,13 @@ Z_APDU *mp::odr::create_initResponse(const Z_APDU *in_apdu,
             zget_init_diagnostics(m_odr, error, addinfo);
         *apdu->u.initResponse->result = 0;
     }
+    apdu->u.initResponse->implementationName =
+        odr_prepend(m_odr, "Metaproxy",
+                    apdu->u.initResponse->implementationName);
+    apdu->u.initResponse->implementationVersion = 
+        odr_prepend(m_odr,
+                    VERSION, apdu->u.initResponse->implementationVersion);
+                   
     return apdu;
 }
 
@@ -617,12 +685,21 @@ Z_ReferenceId **mp_util::get_referenceId(const Z_APDU *apdu)
     return 0;
 }
 
+std::string mp_util::uri_encode(std::string s)
+{
+    char *x = (char *) xmalloc(1 + s.length() * 3);
+    yaz_encode_uri_component(x, s.c_str());
+    std::string result(x);
+    return result;
+}
+
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+