From owner-p4-projects@FreeBSD.ORG  Mon Dec 28 22:43:09 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E096310656A4; Mon, 28 Dec 2009 22:43:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A4243106568B
	for <perforce@FreeBSD.org>; Mon, 28 Dec 2009 22:43:08 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 795358FC16
	for <perforce@FreeBSD.org>; Mon, 28 Dec 2009 22:43:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBSMh8IZ060004
	for <perforce@FreeBSD.org>; Mon, 28 Dec 2009 22:43:08 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBSMh8df060002
	for perforce@freebsd.org; Mon, 28 Dec 2009 22:43:08 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 28 Dec 2009 22:43:08 GMT
Message-Id: <200912282243.nBSMh8df060002@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172335 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Dec 2009 22:43:09 -0000

http://p4web.freebsd.org/chv.cgi?CH=172335

Change 172335 by pgj@Binturong on 2009/12/28 22:42:12

	Fix country matching routines for generating FreeBSD-related
	events map chart.
	
	Submitted by:	bland

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#6 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#6 (text+ko) ====

@@ -66,7 +66,7 @@
     use="concat(startdate/year, format-number(startdate/month, '00'))"/>
 
   <xsl:key name="event-by-country" match="event"
-    use="location/country" />
+    use="location/country/@code" />
 
   <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) &gt; number($curdate.year)) or
 	    (number(enddate/year) = number($curdate.year) and
@@ -74,7 +74,7 @@
 	    (number(enddate/year) = number($curdate.year) and
 	     number(enddate/month) = number($curdate.month) and
 	     enddate/day &gt;= $curdate.day))]"
-    use="location/country" />
+    use="location/country/@code" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />
 
@@ -83,8 +83,8 @@
   <xsl:variable name="chart-countries">
     <xsl:for-each select="event[
 	generate-id() =
-	generate-id(key('event-by-country', location/country)[1])]">
-      <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
+	generate-id(key('event-by-country', location/country/@code)[1])]">
+      <xsl:sort select="format-number(count(key('event-by-country', location/country/@code)), '000')" order="descending"/>
         <xsl:value-of select="location/country/@code" />
     </xsl:for-each>
   </xsl:variable>
@@ -92,10 +92,10 @@
   <xsl:variable name="chart-country-counts">
     <xsl:for-each select="event[
 	generate-id() =
-	generate-id(key('event-by-country', location/country)[1])]">
-      <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
-        <xsl:if test="count(key('upcoming-event-by-country', location/country)) != 0">100.0</xsl:if>
-        <xsl:if test="count(key('upcoming-event-by-country', location/country)) = 0"><xsl:value-of select="count(key('event-by-country', location/country))" />.0</xsl:if>
+	generate-id(key('event-by-country', location/country/@code)[1])]">
+      <xsl:sort select="format-number(count(key('event-by-country', location/country/@code)), '000')" order="descending"/>
+        <xsl:if test="count(key('upcoming-event-by-country', location/country/@code)) != 0">100.0</xsl:if>
+        <xsl:if test="count(key('upcoming-event-by-country', location/country/@code)) = 0"><xsl:value-of select="count(key('event-by-country', location/country/@code))" />.0</xsl:if>
         <xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>
   </xsl:variable>