josch/yolanda
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added tag search, a few improvements on the results page

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@176 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
josch 2007-11-05 16:24:17 +00:00
parent 283a2c5b32
commit 384fcb6467
6 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/functions.pl
View file

@ -17,7 +17,7 @@ sub fill_tagcloud
while (my ($text, $count) = $sth->fetchrow_array()) while (my ($text, $count) = $sth->fetchrow_array())
{ {
#push the new value to the $page->tagcloud array #push the new value to the $page->tagcloud array
push @{ $page->{tagcloud}->{tag} }, { text => [$text], count => [$count] }; push @{ $page->{tagcloud}->{tag} }, { text => [$text =~ / / ? "\"$text\"" : $text], count => [$count] };
} }
#finish query #finish query

6
trunk/locale/en-us.xml
View file

@ -67,9 +67,9 @@
<!-- results page--> <!-- results page-->
<str id="results_for_query">results for query</str> <str id="results_for_query">results for query</str>
<str id="ordered_by">ordered by</str> <str id="ordered_by">ordered by </str>
<str id="ascending">ascending</str> <str id="ascending"> ascending</str>
<str id="descending">descending</str> <str id="descending"> descending</str>
<str id="results_on">results on</str> <str id="results_on">results on</str>
<str id="pages">pages</str> <str id="pages">pages</str>
<str id="relevance">relevance</str> <str id="relevance">relevance</str>

17
trunk/search.pl
View file

@ -22,23 +22,36 @@ if($query->param('query') or $query->param('orderby'))
my @args = (); my @args = ();
$strquery = $query->param('query');
push @tags, $strquery =~ /tag:"([^"]+)"/gi;
push @tags, $strquery =~ /tag:(\w+)/gi;
$strquery =~ s/(tag|title):"[^"]+"//gi;
$strquery =~ s/(tag|title):\w+//gi;
$strquery =~ s/^\s*(.*?)\s*$/$1/;
#build mysql query #build mysql query
$dbquery = "select v.id, v.title, v.description, u.username, from_unixtime( v.timestamp ), $dbquery = "select v.id, v.title, v.description, u.username, from_unixtime( v.timestamp ),
v.creator, v.subject, v.contributor, v.source, v.language, v.coverage, v.rights, v.creator, v.subject, v.contributor, v.source, v.language, v.coverage, v.rights,
v.license, filesize, duration, width, height, fps, viewcount, downloadcount"; v.license, filesize, duration, width, height, fps, viewcount, downloadcount";
if($query->param('query')) if($strquery)
{ {
$dbquery .= ", match(v.title, v.description, v.subject) against( ? in boolean mode) as relevance"; $dbquery .= ", match(v.title, v.description, v.subject) against( ? in boolean mode) as relevance";
$dbquery .= " from videos as v, users as u where u.id = v.userid"; $dbquery .= " from videos as v, users as u where u.id = v.userid";
$dbquery .= " and match(v.title, v.description, v.subject) against( ? in boolean mode)"; $dbquery .= " and match(v.title, v.description, v.subject) against( ? in boolean mode)";
push @args, $query->param('query'), $query->param('query'); push @args, $strquery, $strquery;
} }
else else
{ {
$dbquery .= " from videos as v, users as u where u.id = v.userid"; $dbquery .= " from videos as v, users as u where u.id = v.userid";
} }
if(@tags)
{
$dbquery .= " and match(v.subject) against (? in boolean mode)";
push @args, "@tags";
}
if($query->param('orderby')) if($query->param('orderby'))
{ {
if($query->param('orderby') eq 'filesize') if($query->param('orderby') eq 'filesize')

6
trunk/xsl/xhtml.xsl
View file

@ -289,7 +289,11 @@
</xsl:attribute> </xsl:attribute>
<fieldset> <fieldset>
<xsl:value-of select="$locale_strings[@id='search']" />: <xsl:value-of select="$locale_strings[@id='search']" />:
<input type="text" name="query" size="auto" /> <input type="text" name="query" size="30">
<xsl:attribute name="value">
<xsl:value-of select="//results/@value" />
</xsl:attribute>
</input>
</fieldset> </fieldset>
</form> </form>
</div> </div>

6
trunk/xsl/xhtml/results.xsl
View file

@ -79,9 +79,9 @@
<xsl:template name="results"> <xsl:template name="results">
<div> <div>
<xsl:choose> <xsl:choose>
<xsl:when test="//results/@query!=''"> <xsl:when test="//results/@value!=''">
<xsl:value-of select="$locale_strings[@id='results_for_query']" /> <!-- <xsl:value-of select="$locale_strings[@id='results_for_query']" /> -->
"<xsl:value-of select="//results/@query" />" <i><xsl:value-of select="//results/@value" /></i><br />
<xsl:if test="//results/@orderby!=''"> <xsl:if test="//results/@orderby!=''">
<xsl:value-of select="$locale_strings[@id='ordered_by']" /> <xsl:value-of select="$locale_strings[@id='ordered_by']" />
<xsl:choose> <xsl:choose>

4
trunk/xsl/xhtml/video.xsl
View file

@ -7,6 +7,10 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
> >
<xsl:template name="video">
</xsl:template>
<xsl:template name="video"> <xsl:template name="video">
<div class="video"> <div class="video">
<xsl:choose> <xsl:choose>