X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=xsl%2Firspy2zeerex.xsl;h=3f22386b4bb136ccbbc28b7af237a8b3fe826e9a;hp=c3d00411dce0002d0f15d809b3862e773cce1d94;hb=83b0d977c545f18ff8931b344a5bf3159e1d23ae;hpb=159770da6be561f43501b869eebef94f2dc4b57c

diff --git a/xsl/irspy2zeerex.xsl b/xsl/irspy2zeerex.xsl
index c3d0041..3f22386 100644
--- a/xsl/irspy2zeerex.xsl
+++ b/xsl/irspy2zeerex.xsl
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!--
-    $Id: irspy2zeerex.xsl,v 1.18 2007-03-30 12:48:36 sondberg Exp $
 
     This stylesheet is used by IRSpy to map the internal mixed Zeerex/IRSpy
     record format into the Zeerex record which we store.
@@ -73,7 +72,8 @@
 
         <!-- If not, insert what we already had... -->
         <xsl:otherwise>
-          <xsl:copy-of select="explain:indexInfo/*"/>
+          <xsl:copy-of
+                select="explain:indexInfo/explain:index[@search='true']"/>
         </xsl:otherwise>
       </xsl:choose>
     </indexInfo>
@@ -124,6 +124,8 @@
   -->
   <xsl:template name="insert-irspySection">
     <irspy:status>
+      <xsl:copy-of select="*/irspy:libraryType"/>
+      <xsl:copy-of select="*/irspy:country"/>
       <xsl:copy-of select="*/irspy:probe"/>
 
       <xsl:call-template name="insert-latest-nodes">
@@ -172,14 +174,15 @@
     <xsl:param name="what" select="'unspecified'"/>
     <xsl:param name="i" select="count(*/irspy:probe[@ok='1'])"/>
     <xsl:variable name="date"
-        select="*/irspy:probe[@ok='1' and position() = $i]"/>
+        select="*/irspy:probe[@ok='1'][$i]"/>
     <xsl:variable name="latest"
-        select="$nodes[irspy:strcmp(text(), $date) > 0]"/>
+        select="$nodes[irspy:strcmp(text(), $date) >= 0]"/>
 
     <xsl:choose>
       <xsl:when test="$latest">
         <xsl:copy-of select="$latest"/>
       </xsl:when>
+      <!-- <xsl:when test="$i > 0 and $i &lt; 200"> -->
       <xsl:when test="$i > 0">
         <xsl:call-template name="insert-latest-nodes">
           <xsl:with-param name="what" select="$what"/>
@@ -209,22 +212,16 @@
       </xsl:call-template>
     </xsl:param>
 
-    <index>
-      <xsl:attribute name="search">
-        <xsl:choose>
-          <xsl:when test="$update/@ok = 1">true</xsl:when>
-          <xsl:otherwise>false</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <title primary="true" lang="en">
-        <xsl:value-of select="$title"/>
-      </title>
-      <map primary="true">
-        <attr type="1" set="{$update/@set}">
-          <xsl:value-of select="$update/@ap"/>
-        </attr>
-      </map>
-    </index>
+    <xsl:if test="$update/@ok = 1">
+      <index search="true">
+        <title primary="true" lang="en"><xsl:value-of select="$title"/></title>
+        <map primary="true">
+          <attr type="1" set="{$update/@set}">
+            <xsl:value-of select="$update/@ap"/>
+          </attr>
+        </map>
+      </index>
+    </xsl:if>
   </xsl:template>