From 1bb94b04baa328b11b7befd075c18cbaf05fa245 Mon Sep 17 00:00:00 2001
From: Antti Ajanki <antti.ajanki@iki.fi>
Date: Tue, 12 Apr 2011 22:16:13 +0300
Subject: Fix Vimeo search

---
 templates/vimeo.com/search.xsl        |  5 +++--
 templates/vimeo.com/searchresults.xsl | 21 +++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/templates/vimeo.com/search.xsl b/templates/vimeo.com/search.xsl
index eb99f03..386beaa 100644
--- a/templates/vimeo.com/search.xsl
+++ b/templates/vimeo.com/search.xsl
@@ -2,7 +2,8 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:str="http://exslt.org/strings">
+  xmlns:str="http://exslt.org/strings"
+  exclude-result-prefixes="str">
 
 <xsl:template match="/">
 <wvmenu>
@@ -22,7 +23,7 @@
 
   <button>
     <label>Search</label>
-    <submission>wvt:///vimeo.com/searchresults.xsl?srcurl=<xsl:value-of select="concat(str:encode-uri('http://vimeo.com/videos/search:', true()), '{keywords}/', substring(id('xsrft')/@value, 0, 9), '{orderby}')"/>&amp;HTTP-header=cookie,xsrft%3D<xsl:value-of select="substring(id('xsrft')/@value, 0, 9)"/>;searchtoken%3D<xsl:value-of select="substring(id('xsrft')/@value, 0, 9)"/>&amp;param=searchtoken,<xsl:value-of select="substring(id('xsrft')/@value, 0, 9)"/></submission>
+    <submission>wvt:///vimeo.com/searchresults.xsl?srcurl=<xsl:value-of select="concat(str:encode-uri('http://vimeo.com/search/videos/search:', true()), '{keywords}/', substring(id('xsrft')/@value, 0, 9), '{orderby}')"/>&amp;HTTP-header=cookie,uid%3D0;searchtoken%3D<xsl:value-of select="substring(id('xsrft')/@value, 0, 9)"/>&amp;param=searchtoken,<xsl:value-of select="substring(id('xsrft')/@value, 0, 9)"/></submission>
   </button>
 </wvmenu>
 </xsl:template>
diff --git a/templates/vimeo.com/searchresults.xsl b/templates/vimeo.com/searchresults.xsl
index c5af5ab..1cf8381 100644
--- a/templates/vimeo.com/searchresults.xsl
+++ b/templates/vimeo.com/searchresults.xsl
@@ -2,7 +2,8 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:str="http://exslt.org/strings">
+  xmlns:str="http://exslt.org/strings"
+  exclude-result-prefixes="str">
 
 <xsl:param name="searchtoken"/>
 
@@ -12,9 +13,21 @@
 
   <xsl:for-each select="//div[@class='title']/a">
     <link>
+      <xsl:variable name="clipid">
+	<xsl:choose>
+	  <xsl:when test="contains(@href, '?')">
+	    <xsl:value-of select="str:split(substring-before(@href, '?'), '/')[last()]"/>
+	  </xsl:when>
+	    
+	  <xsl:otherwise>
+	    <xsl:value-of select="str:split(@href, '/')[last()]"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:variable>
+
       <label><xsl:value-of select="."/></label>
-      <stream>wvt:///vimeo.com/video.xsl?srcurl=http://www.vimeo.com/moogaloop/load/clip:<xsl:value-of select="str:split(@href, '/')[last()]"/></stream>
-      <ref>wvt:///vimeo.com/description.xsl?srcurl=http://vimeo.com/api/v2/video/<xsl:value-of select="str:split(@href, '/')[last()]"/>.xml</ref>
+      <stream>wvt:///vimeo.com/video.xsl?srcurl=http://www.vimeo.com/moogaloop/load/clip:<xsl:value-of select="$clipid"/>&amp;HTTP-header=user-agent,Wget/1.2%20%28linux-gnu%29</stream>
+      <ref>wvt:///vimeo.com/description.xsl?srcurl=http://vimeo.com/api/v2/video/<xsl:value-of select="$clipid"/>.xml</ref>
     </link>
   </xsl:for-each>
 
@@ -26,7 +39,7 @@
       <xsl:if test="img/@alt = 'next'">
         <label>Next</label>
       </xsl:if>
-      <ref>wvt:///vimeo.com/searchresults.xsl?srcurl=<xsl:value-of select="./@href"/>&amp;HTTP-header=cookie,xsrft%3D<xsl:value-of select="$searchtoken"/>;searchtoken%3D<xsl:value-of select="$searchtoken"/>&amp;param=searchtoken,<xsl:value-of select="$searchtoken"/></ref>
+      <ref>wvt:///vimeo.com/searchresults.xsl?srcurl=<xsl:value-of select="translate(./@href, ' ', '+')"/>&amp;HTTP-header=cookie,uid%3D0;searchtoken%3D<xsl:value-of select="$searchtoken"/>&amp;param=searchtoken,<xsl:value-of select="$searchtoken"/></ref>
     </link>
   </xsl:for-each>
 
-- 
cgit v1.2.3