From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 16 Jun 2014 10:50:48 +0000 (+0200)
Subject: Deduce zorba setFileName from script
X-Git-Tag: v0.1~7
X-Git-Url: http://git.indexdata.com/?p=mp-xquery-moved-to-github.git;a=commitdiff_plain;h=6fe295deeaa7b097741702768586e833a88e0732

Deduce zorba setFileName from script
---

diff --git a/src/config.xml b/src/config.xml
index c7f0b46..70a2a02 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -17,7 +17,6 @@
       </filter>
       <filter type="xquery">
 	<script value="/home/adam/proj/marc2bibframe/xbin/zorba3-0.xqy"/>
-	<filename value="/home/adam/proj/marc2bibframe/xbin/"/>
 	<record value="marcxmluri"/>
 	<setVariable name="serialization" value="rdxml"/>
 	<setVariable name="baseuri" value="http://base/"/>
diff --git a/src/metaproxy_filter_xquery.cpp b/src/metaproxy_filter_xquery.cpp
index 51afacd..c3d5d91 100644
--- a/src/metaproxy_filter_xquery.cpp
+++ b/src/metaproxy_filter_xquery.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/log.h>
 #include <yaz/oid_db.h>
 #include <map>
-
+#include <string>
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -322,19 +322,6 @@ void yf::XQuery::configure(const xmlNode * ptr, bool test_only,
             if (name.length() > 0)
                 zorba_variables[name] = value;
         }
-        else if (!strcmp((const char *) ptr->name, "filename"))
-        {
-            std::string value;
-            struct _xmlAttr *attr;
-            for (attr = ptr->properties; attr; attr = attr->next)
-                if (!strcmp((const char *) attr->name, "value"))
-                    value = mp::xml::get_text(attr->children);
-                else
-                    throw mp::filter::FilterException(
-                        "Bad attribute " + std::string((const char *)
-                                                       attr->name));
-            zorba_filename = value;
-        }
         else if (!strcmp((const char *) ptr->name, "script"))
         {
             std::string value;
@@ -372,8 +359,6 @@ void yf::XQuery::configure(const xmlNode * ptr, bool test_only,
         throw mp::filter::FilterException("Missing element script");
     if (zorba_record_variable.length() == 0)
         throw mp::filter::FilterException("Missing element record");
-    if (zorba_filename.length() == 0)
-        throw mp::filter::FilterException("Missing element filename");
     if (!test_only)
     {
         void* lStore = StoreManager::getStore();
@@ -381,11 +366,12 @@ void yf::XQuery::configure(const xmlNode * ptr, bool test_only,
 
         lQuery = lZorba->createQuery();
 
-        lQuery->setFileName(zorba_filename);
-
-        std::unique_ptr<std::istream> qfile;
-        qfile.reset(new std::ifstream(zorba_script.c_str()));
+        size_t t = zorba_script.find_last_of('/');
+        if (t != std::string::npos)
+            lQuery->setFileName(zorba_script.substr(0, t + 1));
 
+        std::unique_ptr<std::istream> qfile(
+            new std::ifstream(zorba_script.c_str()));
         Zorba_CompilerHints lHints;
         lQuery->compile(*qfile, lHints);
     }