Changeset 85

Timestamp:

12/06/10 01:49:57 (14 years ago)

Author:

nanardon

Message:

• try to have rpm info in english

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Rpms.pm (modified) (2 diffs)
• root/templates/html/index.tt (modified) (2 diffs)

server/trunk/web/lib/Sophie/Controller/Rpms.pm

@@ -61 +61 @@
     my %info = ( pkgid => $pkgid );
     foreach (qw(name version release epoch url group size packager
-                url summary description sourcerpm license buildhost
-                pkgid builddate arch distribution)) {
+                url sourcerpm license buildhost
+                arch distribution)) {
         if (my $r = $c->model('base')->resultset('Rpms')->search(
             { pkgid => $pkgid },
             { 
-                select => [ qq{rpmqueryformat("header", ?)} ],
+                select => [ qq{rpmquery("header", ?)} ],
                 as => [ 'qf' ],
-                bind => [ "%{$_}" ],
+                bind => [ $_ ],
             }
             )->next) { 
@@ -74 +74 @@
         }
     }
+    my $rpm = $c->model('base')->resultset('Rpms')->search(
+            { pkgid => $pkgid },
+        )->next;
+    $info{description} = $rpm->description;
+    $info{summary} = $rpm->summary;
 
     return $c->stash->{xmlrpc} = \%info;

server/trunk/web/root/templates/html/index.tt

@@ -1 +1 @@
 <!-- $Id -->
+[% USE 'GuessEncode' %]
+[% USE 'ObfuscateMail' %]
 
 [% FOREACH package = c.forward('/search/bydate', [
@@ -13 +15 @@
     [% package.filename %]</a></h2>
 <p>
-[% c.forward('/rpms/queryformat', [ package.pkgid, '%{summary}' ]) | html %]
+[% c.forward('/rpms/info', [ package.pkgid ]).summary | guessencode | html %]
 </p>
 <p>[% package.distribution | html %] - [% package.release | html %] -