From stephane.blondon at gmail.com Mon Dec 2 00:05:29 2013
From: stephane.blondon at gmail.com (=?UTF-8?Q?St=C3=A9phane_Blondon?=)
Date: Mon, 2 Dec 2013 01:05:29 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To: <20131127112913.GB20484@yellowpig>
References:
<20131105105435.GB10999@yellowpig>
<20131106172130.GA11307@yellowpig>
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
Message-ID:
Hello everyone,
2013/11/27 Bill Allombert :
>> I plan to provide a patch against the perl script if it's ok for you.
>
> Please do.
There are a patch and the modified file in attachments.
I executed it to check the modified generated files and I didn't see
errors. Could anyone check too?
I'm not a Perl developper so you can can improve my patch too.
> If you like, you can move the templates to separated files that will
> be read by the perl script.
With the patch, the html is not extracted in external templates.
Do you think about using a template engine or just extracting the
content of the html strings in .html files which would be read by the
script?
Cheers,
--
Imprimez ce message en A2 et en couleur au moins 500 fois!
Br?lez des arbres!!
-- envoy? depuis ma centrale ? charbon
St?phane
-------------- next part --------------
A non-text attachment was scrubbed...
Name: popcon.pl
Type: application/x-perl
Size: 18144 bytes
Desc: not available
URL:
From stephane.blondon at gmail.com Mon Dec 2 00:07:25 2013
From: stephane.blondon at gmail.com (=?UTF-8?Q?St=C3=A9phane_Blondon?=)
Date: Mon, 2 Dec 2013 01:07:25 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To:
References:
<20131105105435.GB10999@yellowpig>
<20131106172130.GA11307@yellowpig>
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
Message-ID:
2013/12/2 St?phane Blondon :
> There are a patch and the modified file in attachments.
...and the patch I forgot to send.
--
Imprimez ce message en A2 et en couleur au moins 500 fois!
Br?lez des arbres!!
-- envoy? depuis ma centrale ? charbon
St?phane
-------------- next part --------------
--- popcon.orig.pl 2013-12-01 14:02:13.878265012 +0100
+++ popcon.pl 2013-12-02 00:24:07.707788036 +0100
@@ -48,54 +48,51 @@
sub htmlheader
{
+ my $name = $_[0];
+ my $report_label = $poptext{$name};
print HTML <<"EOH";
- Debian Popularity Contest
-
-
-
-
-
+
EOH
}
sub popconintro
{
- my ($name,$page) = @_;
- &htmlheader;
+ my ($name, $page) = @_;
+ &htmlheader($name);
print HTML <<"EOF";
+
+
Debian Popularity Contest
The popularity contest project is an attempt to map the usage of
Debian packages. This site publishes the statistics gathered from report
sent by users of the README and the
FAQ.
-
-
-Made by Bill Allombert . Last generated on $date UTC.
+}
+
+sub htmlfooter
+{
+ my $date=gmtime();
+ print HTML <
+Made by Bill Allombert. Last generated on $date UTC. Popularity-contest project by Avery Pennarun, Bill Allombert and Petter Reinholdtsen.
-Copyright (C) 2004-2005 SPI;
-See license terms.
-
+Copyright (C) 2004-2013 SPI;
+See license terms.
+
EOH
@@ -377,7 +390,8 @@
print HTML ("\n");
}
print HTML ("\n \n");
- htmlfooter $numsub;
+ rawresults($numsub, $popfile);
+ htmlfooter;
closedir SEC;
close HTML;
}
@@ -412,12 +426,14 @@
print HTML ("\n");
}
print HTML ("\n \n");
- htmlfooter $numsub;
+ rawresults($numsub, $popfile);
+ htmlfooter;
closedir SEC;
close HTML;
}
open HTML , ">:utf8", "$popcon/index.html";
popconintro($name,"index.html");
+ printf HTML ("
Download
");
printf HTML ("
Statistics for the whole archive sorted by fields:
");
print_by (".",$_) for (@fields);
print HTML ("
\n
\n");
@@ -446,12 +462,14 @@
print_by ($dir,$_) for (@fields);
print HTML ("\n");
}
+ printf HTML ("\n");
+ rawresults($numsub, $popfile);
print HTML <<'EOF';
-
+
+
Statistics per Debian architectures
-
-Statistics per Debian architectures:
+
EOF
for $f (grep { $_ ne 'unknown' } sort keys %arch)
@@ -478,10 +496,14 @@
+
+
EOF
print HTML <<'EOF';
-
-Statistics per popularity-contest releases:
+
Statistics per popularity-contest releases
+
+
+
EOF
for $f (grep { $_ ne 'unknown' } sort keys %release)
@@ -507,10 +529,11 @@
+
+
+
EOF
- print HTML "
\n";
- print HTML "Raw popularity-contest results\n";
- htmlfooter $numsub;
+ htmlfooter;
close HTML;
}
From stephane.blondon at gmail.com Sat Dec 7 15:58:48 2013
From: stephane.blondon at gmail.com (=?UTF-8?Q?St=C3=A9phane_Blondon?=)
Date: Sat, 7 Dec 2013 16:58:48 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To:
References:
<20131105105435.GB10999@yellowpig>
<20131106172130.GA11307@yellowpig>
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
Message-ID:
2013/12/2 St?phane Blondon :
> There are a patch and the modified file in attachments.
> I executed it to check the modified generated files and I didn't see
> errors. Could anyone check too?
There were no reply to this re-mail so I suppose the patch is ok (or
no one checks?).
So ,what is the next step?
What can I do to help you?
Cheers,
--
Imprimez ce message en A2 et en couleur au moins 500 fois!
Br?lez des arbres!!
-- envoy? depuis ma centrale ? charbon
St?phane
From ballombe at debian.org Sat Dec 7 20:45:51 2013
From: ballombe at debian.org (Bill Allombert)
Date: Sat, 7 Dec 2013 21:45:51 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To:
References:
<20131106172130.GA11307@yellowpig>
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
Message-ID: <20131207204551.GB9975@yellowpig>
On Sat, Dec 07, 2013 at 04:58:48PM +0100, St?phane Blondon wrote:
> 2013/12/2 St?phane Blondon :
> > There are a patch and the modified file in attachments.
> > I executed it to check the modified generated files and I didn't see
> > errors. Could anyone check too?
>
> There were no reply to this re-mail so I suppose the patch is ok (or
> no one checks?).
I had a look at your patch, but I did not have time to run it yet.
Cheers,
--
Bill.
Imagine a large red swirl here.
From ballombe at debian.org Sun Dec 8 21:08:48 2013
From: ballombe at debian.org (Bill Allombert)
Date: Sun, 8 Dec 2013 22:08:48 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To: <20131207204551.GB9975@yellowpig>
References: <20131106172130.GA11307@yellowpig>
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
<20131207204551.GB9975@yellowpig>
Message-ID: <20131208210848.GH9975@yellowpig>
On Sat, Dec 07, 2013 at 09:45:51PM +0100, Bill Allombert wrote:
> On Sat, Dec 07, 2013 at 04:58:48PM +0100, St?phane Blondon wrote:
> > 2013/12/2 St?phane Blondon :
> > > There are a patch and the modified file in attachments.
> > > I executed it to check the modified generated files and I didn't see
> > > errors. Could anyone check too?
> >
> > There were no reply to this re-mail so I suppose the patch is ok (or
> > no one checks?).
>
> I had a look at your patch, but I did not have time to run it yet.
OK, I have changed popcon.debian.org to use your script.
I did not see any problem. Please check it is OK.
Something we should fix is the line
Copyright (C) 2004-2013 SPI; See license terms.
I copied it from the old layout, and the intent was that it only applied
to the part I copied, but it was not stated.
(P.S.: Tell me if you prefer I do not CC you.)
Cheers,
--
Bill.
Imagine a large red swirl here.
From stephane.blondon at gmail.com Wed Dec 11 22:55:57 2013
From: stephane.blondon at gmail.com (=?UTF-8?Q?St=C3=A9phane_Blondon?=)
Date: Wed, 11 Dec 2013 23:55:57 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To: <20131208210848.GH9975@yellowpig>
References: <20131106172130.GA11307@yellowpig>
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
<20131207204551.GB9975@yellowpig> <20131208210848.GH9975@yellowpig>
Message-ID:
Hello,
2013/12/8 Bill Allombert :
> OK, I have changed popcon.debian.org to use your script.
> I did not see any problem. Please check it is OK.
Thank you for the commit!
I checked the web pages and I didn't saw problems.
> Something we should fix is the line
>
> Copyright (C) 2004-2013 SPI; See license terms.
>
> I copied it from the old layout, and the intent was that it only applied
> to the part I copied, but it was not stated.
>
> (P.S.: Tell me if you prefer I do not CC you.)
Until the code rests under free software, I don't mind.
Please keep me in cc, so I will know the final choice.
Cheers
--
Imprimez ce message en A2 et en couleur au moins 500 fois!
Br?lez des arbres!!
-- envoy? depuis ma centrale ? charbon
St?phane
From ballombe at debian.org Sat Dec 14 23:14:55 2013
From: ballombe at debian.org (Bill Allombert)
Date: Sun, 15 Dec 2013 00:14:55 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To:
References:
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
<20131207204551.GB9975@yellowpig> <20131208210848.GH9975@yellowpig>
Message-ID: <20131214231455.GA30410@yellowpig>
On Wed, Dec 11, 2013 at 11:55:57PM +0100, St?phane Blondon wrote:
> Hello,
>
> 2013/12/8 Bill Allombert :
> > OK, I have changed popcon.debian.org to use your script.
> > I did not see any problem. Please check it is OK.
>
> Thank you for the commit!
> I checked the web pages and I didn't saw problems.
The secondary pages like
still carry
Raw popularity-contest results
and
Number of submissions considered: 160932
maybe we should remove them.
Also maybe the secondary pagaes should carry a different 'breadcrumbs'
(/ Debian Popularity Contest / All reports)
> > Something we should fix is the line
> >
> > Copyright (C) 2004-2013 SPI; See license terms.
> >
> > I copied it from the old layout, and the intent was that it only applied
> > to the part I copied, but it was not stated.
> >
> > (P.S.: Tell me if you prefer I do not CC you.)
>
> Until the code rests under free software, I don't mind.
In the new layout (on www.debian.org) it is stated
Copyright ? 1997-2013 SPI and others; See license terms
Debian is a registered trademark of Software in the Public Interest, Inc.
instead. So we should update it.
> Please keep me in cc, so I will know the final choice.
OK, I was not sure if you were subscribed to the list.
Thanks again for your work!
Cheers,
--
Bill.
Imagine a large red swirl here.
From stephane.blondon at gmail.com Mon Dec 16 22:57:55 2013
From: stephane.blondon at gmail.com (=?UTF-8?Q?St=C3=A9phane_Blondon?=)
Date: Mon, 16 Dec 2013 23:57:55 +0100
Subject: [Popcon-developers] popcon page renders like the old style of
the main debian website
In-Reply-To: <20131214231455.GA30410@yellowpig>
References:
<20131110102918.GB30195@yellowpig>
<20131127112913.GB20484@yellowpig>
<20131207204551.GB9975@yellowpig> <20131208210848.GH9975@yellowpig>
<20131214231455.GA30410@yellowpig>
Message-ID:
Hello,
2013/12/15 Bill Allombert :
>> Until the code rests under free software, I don't mind.
>
> In the new layout (on www.debian.org) it is stated
>
> Copyright ? 1997-2013 SPI and others; See license terms
> Debian is a registered trademark of Software in the Public Interest, Inc.
>
> instead. So we should update it.
Copy-paste the footer from the main website is really easy : a patch
about it is attached to this e-mail.
For the others remarks, I need more time so I will do it in few days.
Everyone is allowed to make a patch before me. ;-)
Have a nice day,
--
Imprimez ce message en A2 et en couleur au moins 500 fois!
Br?lez des arbres!!
-- envoy? depuis ma centrale ? charbon
St?phane
-------------- next part --------------
--- popcon.orig.pl 2013-12-16 23:21:39.000000000 +0100
+++ popcon.pl 2013-12-16 23:33:34.962297204 +0100
@@ -182,9 +182,10 @@