Use query_rewrite filter to throw error for @attr 1=12

diff --git a/etc/config-loc.xml b/etc/config-loc.xml
index 050c792..850f584 100644 (file)
--- a/etc/config-loc.xml
+++ b/etc/config-loc.xml
@@ -47,7 +47,12 @@ the following databaseNames (virtual databases):
 
       <!-- converts CQL to RPN -->
       <filter type="cql_rpn">
-        <conversion file="../etc/cql2pqf.txt"/>
+        <conversion file="cql2pqf.txt"/>
+      </filter>
+
+      <!-- RPN query filter -->
+      <filter type="query_rewrite">
+       <xslt stylesheet="pqf2pqf-loc.xsl"/>
       </filter>
 
       <!-- record transformations -->
@@ -84,6 +89,10 @@ the following databaseNames (virtual databases):
       </filter>
       <filter type="virt_db">
         <virtual>
+          <database>idtest</database>
+          <target>localhost:9999/Default</target>
+        </virtual>
+        <virtual>
           <database>LCDB_UTF8</database>
           <target>z3950.loc.gov:7097/LCDB_UTF8</target>
         </virtual>
@@ -159,7 +168,6 @@ the following databaseNames (virtual databases):
         </virtual>
       </filter>
       <filter type="load_balance"/>
-
       <filter type="log">
        <message>B</message>
        <category apdu="true"/>

diff --git a/etc/pqf2pqf-loc.xsl b/etc/pqf2pqf-loc.xsl
new file mode 100644 (file)
index 0000000..9db8ce8
--- /dev/null
+++ b/etc/pqf2pqf-loc.xsl
@@ -0,0 +1,64 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+  <xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
+
+  <!--
+./yaz-xmlquery -p '@and @attr 1=1016 @attr 4=2 @attr 6=3 the @attr 1=4 fish' > test.xml && xmllint -format test.xml && ./yaz-xmlquery -x test1.xml && xsltproc pqf2pqf.xsl test.xml |tee test2.xml && ./yaz-xmlquery -x test2.xml 
+
+./yaz-xmlquery -p '@not @attr 1=1016 @attr 4=2 @attr 6=3 @attr 7=1 @attr 8=4 fish @attr 1=4 fish' > test.xml && xmllint -format test.xml && ./yaz-xmlquery -x test.xml && xsltproc pqf2pqf.xsl test.xml |tee test2.xml && ./yaz-xmlquery -x test2.xml 
+  -->
+
+  <!-- disable default templates -->
+  <xsl:template match="text()"/>
+  <xsl:template match="node()"/>
+
+  <!-- identity stylesheet templates -->
+  <!-- these parse pqf-xml input recursively and make identity operations -->
+  <xsl:template match="/query">
+    <query>
+      <xsl:apply-templates/>
+    </query>
+  </xsl:template>
+
+  <xsl:template match="rpn">
+    <rpn>
+      <xsl:attribute name="set">
+        <xsl:value-of  select="@set"/>
+      </xsl:attribute>
+      <xsl:apply-templates/>
+    </rpn>
+  </xsl:template>
+
+  <xsl:template match="operator">
+    <operator>
+      <xsl:attribute name="type">
+        <xsl:value-of  select="@type"/>
+      </xsl:attribute>
+      <xsl:apply-templates/>
+    </operator>
+  </xsl:template>
+
+  <xsl:template match="apt">
+    <apt>
+      <xsl:apply-templates select="attr"/>
+      <xsl:apply-templates select="term"/>
+    </apt>
+  </xsl:template>
+
+  <xsl:template match="attr">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+
+  <xsl:template match="term">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+
+  <!-- throw diagnostic for unsupported use attributes -->
+  <xsl:template match="attr[@type=1][@value=12]">
+    <diagnostic code="114" addinfo="{@value}"/>
+  </xsl:template>
+
+</xsl:stylesheet>
+
+