X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=xsl%2Firspy2zeerex.xsl;h=8a64677674145f7c99937156cba0d4d86c2b4ac8;hp=f09f936661c021e33b431a8fda51bba1e8aba1c1;hb=e83ff783b8eef097d8710e773c32a8e66afac587;hpb=9015524257d767d49d414cdfd160dcbb993e061d

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index f09f936..8a64677 100644
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.8 2006-10-30 14:55:27 sondberg Exp $
+    $Id: irspy2zeerex.xsl,v 1.13 2006-12-11 11:01:14 sondberg Exp $
 
     This stylesheet is used by IRSpy to map the internal mixed Zeerex/IRSpy
     record format into the Zeerex record which we store.
@@ -19,68 +19,126 @@
       version="1.0"
       encoding="UTF-8"/>
 
-  <xsl:preserve-space elements="*"/>
+  <xsl:strip-space elements="*"/>
 
   <xsl:variable name="old_indexes" select="/*/explain:indexInfo/explain:index"/>
   <xsl:variable name="use_attr_names" select="document('use-attr-names.xml')"/>
 
-  
-  <xsl:template match="node() | @*">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-  </xsl:template>
-
 
   <xsl:template match="/*">
     <explain>
-      <xsl:apply-templates select="explain:serverInfo   |
-                                   explain:databaseInfo |
-                                   explain:metaInfo"/>
-                                   
+      <xsl:call-template name="insert-zeerexBase"/>
       <xsl:call-template name="insert-indexInfo"/>
       <xsl:call-template name="insert-recordInfo"/>
+      <xsl:call-template name="insert-configInfo"/>
       <xsl:call-template name="insert-irspySection"/>
     </explain>
   </xsl:template>
 
 
+  <xsl:template name="insert-zeerexBase">
+    <xsl:copy-of select="explain:serverInfo"/>
+    <xsl:copy-of select="explain:databaseInfo"/>
+    <metaInfo>
+      <dateModified><xsl:value-of
+                    select="/*/irspy:status/*[last()]"/></dateModified>
+    </metaInfo>
+  </xsl:template>
+
+
   <xsl:template name="insert-indexInfo">
     <indexInfo>
-      <xsl:for-each select="/*/irspy:status/irspy:search">
-        <xsl:variable name="set" select="@set"/>
-        <xsl:variable name="ap" select="@ap"/>
-        <xsl:variable name="old"
-            select="$old_indexes[explain:map/explain:attr/@set = $set and
-                                 explain:map/explain:attr/text() = $ap]"/>
-        <xsl:choose>
-          <xsl:when test="$old">
-            <xsl:call-template name="insert-index-section">
-              <xsl:with-param name="title" select="$old/explain:title"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="insert-index-section"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
+      <xsl:choose>
+
+        <!-- Check that search was actually probed -->
+        <xsl:when test="/*/irspy:status/irspy:search">
+          <xsl:for-each select="/*/irspy:status/irspy:search">
+            <xsl:variable name="set" select="@set"/>
+            <xsl:variable name="ap" select="@ap"/>
+            <xsl:variable name="old"
+                select="$old_indexes[explain:map/explain:attr/@set = $set and
+                                     explain:map/explain:attr/text() = $ap]"/>
+            <xsl:choose>
+              <xsl:when test="$old">
+                <xsl:call-template name="insert-index-section">
+                  <xsl:with-param name="title" select="$old/explain:title"/>
+                </xsl:call-template>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:call-template name="insert-index-section"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:for-each>
+        </xsl:when>
+
+        <!-- If not, insert what we already had... -->
+        <xsl:otherwise>
+          <xsl:copy-of select="explain:indexInfo/*"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </indexInfo>
   </xsl:template>
 
 
   <xsl:template name="insert-recordInfo">
     <recordInfo>
-      <xsl:for-each select="/*/irspy:status/irspy:record_fetch[@ok = 1]">
-        <recordSyntax name="{@syntax}">
-          <elementSet name="F"/> <!-- FIXME: This should be probed too -->
-        </recordSyntax>
-      </xsl:for-each>
+      <xsl:choose>
+
+        <!-- Did we actually probe record syntaxes? -->
+        <xsl:when test="/*/irspy:status/irspy:record">
+          <xsl:for-each select="/*/irspy:status/irspy:record_fetch[@ok = 1]">
+            <recordSyntax name="{@syntax}">
+              <elementSet name="F"/> <!-- FIXME: This should be probed too -->
+            </recordSyntax>
+          </xsl:for-each>
+        </xsl:when>
+
+        <!-- If not, use the existing test report... -->
+        <xsl:otherwise>
+          <xsl:copy-of select="explain:recordInfo/*"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </recordInfo>
   </xsl:template>
 
 
+  <xsl:template name="insert-configInfo">
+    <configInfo>
+      <xsl:choose>
+        <xsl:when test="/*/irspy:status/irspy:init_opt">
+          <xsl:for-each select="/*/irspy:status/irspy:init_opt">
+            <supports type="z3950_{@option}">1</supports>
+          </xsl:for-each>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="explain:configInfo/*"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </configInfo>
+  </xsl:template>
+
+
+  <!-- 
+       Here we list the bits and pieces of the irspy:status element which we
+       want to keep in the persistent version of the zeerex record.
+       Simply add "| irspy:xxx" to the select attribute.
+  -->
   <xsl:template name="insert-irspySection">
-    <xsl:copy-of select="/*/irspy:status"/>
+    <irspy:status>
+      <xsl:for-each select="*/irspy:probe   |
+                            */irspy:boolean |
+                            */irspy:named_resultset |
+                            */irspy:explain">
+        <xsl:copy-of select="."/>
+      </xsl:for-each>
+    </irspy:status>
+  </xsl:template>
+
+  
+  <xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:copy>
   </xsl:template>
 
 
@@ -125,10 +183,6 @@
   </xsl:template>
 
 
-  <xsl:template match="explain:dateModified">
-    <dateModified><xsl:value-of
-                    select="/*/irspy:status/*[last()]"/></dateModified>
-  </xsl:template>
-
+  <xsl:template match="*"/>
 
 </xsl:stylesheet>