From f6373a3ba1742f9371e9be4c44f6dc445eda434c Mon Sep 17 00:00:00 2001 From: nicoulas Date: Fri, 21 Jan 2011 16:25:48 +0000 Subject: [PATCH] fixed tags appearing in the footer; added number of times tags are used on our website svn path=/trunk/; revision=19392 --- about/de/de.xsl | 2 +- about/gb/gb.xsl | 2 +- about/it/it.xsl | 2 +- about/legal/de/de.xsl | 2 +- about/members.xsl | 2 +- about/team.xsl | 2 +- campaigns/pdfreaders/buglist.xsl | 2 +- campaigns/pdfreaders/pdfreaders.xsl | 2 +- donate/thankgnus-2001.xsl | 2 +- donate/thankgnus-2002.xsl | 2 +- donate/thankgnus-2003.xsl | 2 +- donate/thankgnus-2004.xsl | 2 +- donate/thankgnus-2005.xsl | 2 +- donate/thankgnus-2006.xsl | 2 +- donate/thankgnus-2007.xsl | 2 +- donate/thankgnus-2008.xsl | 2 +- donate/thankgnus-2009.xsl | 2 +- donate/thankgnus-2010.xsl | 2 +- donate/thankgnus.xsl | 2 +- index.xsl | 2 +- news/newsletter.xsl | 2 +- order/order.xsl | 2 +- orders/order.xsl | 2 +- press/press.xsl | 2 +- projects/finished.xsl | 2 +- projects/inactive.xsl | 2 +- projects/map/de/de.xsl | 2 +- projects/projects.xsl | 2 +- tags/tags.en.xhtml | 4 +- tags/tags.xsl | 3 +- tools/build.pl | 52 +++++++++++++++++++------ tools/build.sh | 16 ++++---- tools/xsltsl/tagging.xsl | 59 ++--------------------------- 33 files changed, 84 insertions(+), 106 deletions(-) diff --git a/about/de/de.xsl b/about/de/de.xsl index 1cad7f7f5f..095b8deb6d 100644 --- a/about/de/de.xsl +++ b/about/de/de.xsl @@ -58,7 +58,7 @@ - + diff --git a/about/gb/gb.xsl b/about/gb/gb.xsl index e8ef3b53ce..11e2390b28 100644 --- a/about/gb/gb.xsl +++ b/about/gb/gb.xsl @@ -147,7 +147,7 @@ - + diff --git a/about/it/it.xsl b/about/it/it.xsl index f0b6742f71..55a1abd5df 100644 --- a/about/it/it.xsl +++ b/about/it/it.xsl @@ -147,7 +147,7 @@ - + diff --git a/about/legal/de/de.xsl b/about/legal/de/de.xsl index 2bf8197dda..c4ea8bda0a 100644 --- a/about/legal/de/de.xsl +++ b/about/legal/de/de.xsl @@ -16,7 +16,7 @@ - + diff --git a/about/members.xsl b/about/members.xsl index c15f2c3f88..057766c8ab 100644 --- a/about/members.xsl +++ b/about/members.xsl @@ -44,7 +44,7 @@ - + diff --git a/about/team.xsl b/about/team.xsl index b90f072738..ec29176afd 100644 --- a/about/team.xsl +++ b/about/team.xsl @@ -19,7 +19,7 @@ - + diff --git a/campaigns/pdfreaders/buglist.xsl b/campaigns/pdfreaders/buglist.xsl index 3f4a240c97..f9ea0bffdd 100644 --- a/campaigns/pdfreaders/buglist.xsl +++ b/campaigns/pdfreaders/buglist.xsl @@ -85,7 +85,7 @@ - + diff --git a/campaigns/pdfreaders/pdfreaders.xsl b/campaigns/pdfreaders/pdfreaders.xsl index d135d59b90..d328037153 100644 --- a/campaigns/pdfreaders/pdfreaders.xsl +++ b/campaigns/pdfreaders/pdfreaders.xsl @@ -56,7 +56,7 @@ - + diff --git a/donate/thankgnus-2001.xsl b/donate/thankgnus-2001.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2001.xsl +++ b/donate/thankgnus-2001.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2002.xsl b/donate/thankgnus-2002.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2002.xsl +++ b/donate/thankgnus-2002.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2003.xsl b/donate/thankgnus-2003.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2003.xsl +++ b/donate/thankgnus-2003.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2004.xsl b/donate/thankgnus-2004.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2004.xsl +++ b/donate/thankgnus-2004.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2005.xsl b/donate/thankgnus-2005.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2005.xsl +++ b/donate/thankgnus-2005.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2006.xsl b/donate/thankgnus-2006.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2006.xsl +++ b/donate/thankgnus-2006.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2007.xsl b/donate/thankgnus-2007.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2007.xsl +++ b/donate/thankgnus-2007.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2008.xsl b/donate/thankgnus-2008.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2008.xsl +++ b/donate/thankgnus-2008.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2009.xsl b/donate/thankgnus-2009.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2009.xsl +++ b/donate/thankgnus-2009.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus-2010.xsl b/donate/thankgnus-2010.xsl index 5e20e64293..292061bccd 100644 --- a/donate/thankgnus-2010.xsl +++ b/donate/thankgnus-2010.xsl @@ -37,7 +37,7 @@ - + diff --git a/donate/thankgnus.xsl b/donate/thankgnus.xsl index 853f15cfa2..529c1fb1c7 100644 --- a/donate/thankgnus.xsl +++ b/donate/thankgnus.xsl @@ -49,7 +49,7 @@ - + diff --git a/index.xsl b/index.xsl index 4cd75ffd13..6ea14697f8 100644 --- a/index.xsl +++ b/index.xsl @@ -123,7 +123,7 @@ - + diff --git a/news/newsletter.xsl b/news/newsletter.xsl index 8a30167bc5..8fabda59a8 100644 --- a/news/newsletter.xsl +++ b/news/newsletter.xsl @@ -39,7 +39,7 @@ - + diff --git a/order/order.xsl b/order/order.xsl index 623a20694e..1aecdeafb9 100644 --- a/order/order.xsl +++ b/order/order.xsl @@ -94,7 +94,7 @@ - + diff --git a/orders/order.xsl b/orders/order.xsl index 3dc621fec1..7557e25add 100644 --- a/orders/order.xsl +++ b/orders/order.xsl @@ -94,7 +94,7 @@ - + diff --git a/press/press.xsl b/press/press.xsl index 8f1ed00910..fcced2b522 100644 --- a/press/press.xsl +++ b/press/press.xsl @@ -35,7 +35,7 @@ - + diff --git a/projects/finished.xsl b/projects/finished.xsl index f11eaa5afd..88ee1b6d81 100644 --- a/projects/finished.xsl +++ b/projects/finished.xsl @@ -27,7 +27,7 @@ - + diff --git a/projects/inactive.xsl b/projects/inactive.xsl index 04b7425c03..bcafa0cf56 100644 --- a/projects/inactive.xsl +++ b/projects/inactive.xsl @@ -27,7 +27,7 @@ - + diff --git a/projects/map/de/de.xsl b/projects/map/de/de.xsl index 260d2d1cee..12417b59ce 100644 --- a/projects/map/de/de.xsl +++ b/projects/map/de/de.xsl @@ -14,7 +14,7 @@ - + diff --git a/projects/projects.xsl b/projects/projects.xsl index cf2d26e759..d08ff885b9 100644 --- a/projects/projects.xsl +++ b/projects/projects.xsl @@ -27,7 +27,7 @@ - + diff --git a/tags/tags.en.xhtml b/tags/tags.en.xhtml index 695e8d529f..68ba99014f 100644 --- a/tags/tags.en.xhtml +++ b/tags/tags.en.xhtml @@ -10,7 +10,9 @@

- Here after is a list of tags that are currently being used. + Here after is a list of tags that are currently being used. The + number in parenthesis is the number of time this tag is used in + our pages.

diff --git a/tags/tags.xsl b/tags/tags.xsl index efdc4af112..b00476a20f 100644 --- a/tags/tags.xsl +++ b/tags/tags.xsl @@ -35,8 +35,7 @@ - - + diff --git a/tools/build.pl b/tools/build.pl index 64cfed489d..9d5f13eeda 100755 --- a/tools/build.pl +++ b/tools/build.pl @@ -32,6 +32,9 @@ use IO::Select; use Socket; use Fcntl ':flock'; +require "/home/nicolas/FSFE/outdated trad check/comptree.pl"; +our $nbout = 0; + # This defines the focuses and their respective preferred / original # language. For example, it says that we should have a focus called # "se" (Sweden) which has the preferred language "sv" (Swedish). @@ -310,6 +313,11 @@ while (wait() != -1) { sub process { my ($file, $langs) = @_; + + if (not $file eq "tags/tags") { + return; + } + print "$file\n"; print STDERR "Building $file.. \n" unless $opts{q}; # Create the root note for the above mentioned XML file (used to feed the XSL @@ -523,6 +531,15 @@ sub process { # TODO: optimise getting texts-content-xx.xml and texts-content-en.xml, # since it does not depend on the xsl file being treated, we should do it only once! + if ( $lang eq "cs" ) { + + print "--->outputting test.xml\n"; + open (TEST, '>', "/home/nicolas/FSFE/fsfe-web-out/test.xml"); + print TEST $sourcedoc->toString(); + close (TEST); + + } + # # Transform the document using the XSL file and then push the # result into the element of the document we're building. @@ -573,17 +590,27 @@ sub process { # with the original (but maybe a second earlier) isn't marked outdated. # my $originalsource = "$file.".$root->getAttribute("original").".xhtml"; - if ((stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200) { - $root->setAttribute("outdated", "yes"); - if ($dir eq "global") { - lock(*TRANSLATIONS); - print TRANSLATIONS "$lang $source $originalsource\n"; - unlock(*TRANSLATIONS); - } - } else { - $root->setAttribute("outdated", "no"); - } - + if ((stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200) { + $root->setAttribute("outdated", "yes"); + if ($dir eq "global") { + lock(*TRANSLATIONS); + print TRANSLATIONS "$lang $source $originalsource\n"; + unlock(*TRANSLATIONS); + } + } else { + $root->setAttribute("outdated", "no"); + } + + if ( not -e "$opts{i}/$originalsource" ) { + # do something + } else { + my ($bool, $err) = areEqual( "$opts{i}/$originalsource", $source ); + if ( not $bool ) { + print "$err\n"; + $nbout += 1; + } + } + # # Get the appropriate textset for this language. If one can't be # found, use the English. (I hope this never happens) @@ -771,3 +798,6 @@ sub unlock { my ($fh) = @_; flock($fh, LOCK_UN); } + + +print "$nbout pages are out of date\n"; diff --git a/tools/build.sh b/tools/build.sh index 248033d876..e1cf3555ca 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -7,14 +7,14 @@ # however, is done by the Perl script build.pl. # ----------------------------------------------------------------------------- -SOURCE=/home/www/fsfe -DEST=/home/www/html -TMP=/home/www/tmp.$$ -STATUS=/var/www/web +SOURCE=. +DEST=../fsfe-web-out/home/www/html +TMP=../fsfe-web-out/home/www/tmp.$$ +STATUS=../fsfe-web-out/var/www/web ALARM_LOCKFILE=alarm_lockfile MAKEFILE_PL=${SOURCE}/Makefile.PL -SVNUPOUTFILE=/tmp/fsfe-svnup-out -SVNUPERRFILE=/tmp/fsfe-svnup-err +SVNUPOUTFILE=../fsfe-web-out/tmp/fsfe-svnup-out +SVNUPERRFILE=../fsfe-web-out/tmp/fsfe-svnup-err # Since we must grep for svn output messages, # let's ensure we get English messages @@ -41,7 +41,7 @@ if [[ -n "$BUILD_STARTED" && "10#${BUILD_STARTED}" -gt 30 && ! -f ${STATUS}/${AL fi # Redirect output -exec 1> ${STATUS}/status.txt 2>&1 +#exec 1> ${STATUS}/status.txt 2>&1 # If some build script is already running, don't run it. if ps -C "build-df.sh,build-test.sh,build.sh" -o pid= | grep -q -v "$$"; then @@ -65,7 +65,7 @@ echo "$(date) Updating source files from SVN." # Since the "svn update" exit status cannot be trusted, and "svn update -q" is # always quiet, we have to test the output of "svn update" (ignoring the final # "At revision" line) and check for any output lines -svn --non-interactive update 2>${SVNUPERRFILE} | grep -v 'At revision' >${SVNUPOUTFILE} +#svn --non-interactive update 2>${SVNUPERRFILE} | grep -v 'At revision' >${SVNUPOUTFILE} cat ${SVNUPOUTFILE} # If "svn update" wrote anything to standard error, exit diff --git a/tools/xsltsl/tagging.xsl b/tools/xsltsl/tagging.xsl index 15ec289132..3523b3a82c 100644 --- a/tools/xsltsl/tagging.xsl +++ b/tools/xsltsl/tagging.xsl @@ -117,29 +117,18 @@ + + + () - - - - @@ -163,49 +152,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -