Output better path

diff --git a/PciIds/Address/Base.pm b/PciIds/Address/Base.pm
index 8b40461dfe3e5921c893176f328bc69e161da249..b9f01aaaf4ddc7882abb8fb2c0a181b39cf8b7c1 100644 (file)
--- a/PciIds/Address/Base.pm
+++ b/PciIds/Address/Base.pm
@@ -40,8 +40,9 @@ sub path( $ ) {
        my @result;
        my $address = $self;
        while( defined( $address = $address->parent() ) ) {
-               push @result, $address;
+               push @result, [ $address, 0 ];
        }
+       unshift @result, [ $self, 0, 1 ];
        return \@result;
 }
 

diff --git a/PciIds/Address/Pci.pm b/PciIds/Address/Pci.pm
index 5fc5443eae07e1d0c179d49e1b00000974acfb19..0775689e808bdb7dd7d7dbb24c543b1f62a22dcb 100644 (file)
--- a/PciIds/Address/Pci.pm
+++ b/PciIds/Address/Pci.pm
@@ -70,7 +70,7 @@ sub path( $ ) {
        my( $self ) = @_;
        my $result = PciIds::Address::Base::path( $self );
        my( $vid ) = ( $self->get() =~ /^PC\/[0-9a-f]{4}\/[0-9a-f]{4}\/([0-9a-f]{4})/ );
-       splice @{$result}, 2, 0, PciIds::Address::new( "PC/$vid" ) if( defined $vid ) && ( $result->[1]->get() ne "PC/$vid" );
+       unshift @{$result}, [ PciIds::Address::new( "PC/$vid" ), 1 ] if( defined $vid );# && ( $result->[1]->[0]->get() ne "PC/$vid" );
        return $result;
 }
 

diff --git a/PciIds/Html/Admin.pm b/PciIds/Html/Admin.pm
index c1ef0517a6ff110923607cfdcc294b4fd66437d2..61a0291dde5850561fd3b4f5ff65a7588e322819 100644 (file)
--- a/PciIds/Html/Admin.pm
+++ b/PciIds/Html/Admin.pm
@@ -70,7 +70,7 @@ sub genNewAdminForm( $$$$$ ) {
                        }
                        print "<tr class='new'><td>New:<td><input type='text' name='name-$cnt' class='text'><td><input type='text' name='note-$cnt' class='text'><td><textarea name='disc-$cnt'></textarea>\n";
                        print "<td colspan='3'>";
-                       genPathBare( $req, $addr, 0, 0 );
+                       genPathBare( $req, $addr, 0, 0, 0 );
                        print "<td><input type='checkbox' name='loc-$cnt-softdel' value='del'>\n";
                }
                print "<tr class='unseen-history'><td class='empty'><td>".safeEncode( ( defined $name && $name eq '' ) ? 'Deletion request' : $name )."<td>".safeEncode( $note )."<td>".safeEncode( $disc )."<td>".mailEncode( $user );

diff --git a/PciIds/Html/List.pm b/PciIds/Html/List.pm
index 116a33ff821632293308f559d3957ee1417c174f..6339e151f3c15a8f533089c3669f1d75a9fead80 100644 (file)
--- a/PciIds/Html/List.pm
+++ b/PciIds/Html/List.pm
@@ -30,10 +30,7 @@ sub list( $$$$ ) {
        print "<div class='clear'></div>\n";
        print "</div\n>";
        genPath( $req, $address, 0 );
-       if( defined $name ) {
-               print '<h2>'.encode( $id ).'</h2>';
-               print htmlDiv( 'name', '<p>Name: '.encode( $name ) );
-       }
+       print htmlDiv( 'name', '<p>Name: '.encode( $name ) ) if defined $name && $name ne '';
        print htmlDiv( 'note', '<p>Note: '.encode( $note ) ) if defined $note && $note ne '';
        my $diss = 0;
        my $history;

diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index 56c1802edd50cc60d9db86db44ef0715bdb2afa0..d27435da8bd2610e37a9773fbed5e1a78146dc38 100644 (file)
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -150,30 +150,40 @@ sub HTTPRedirect( $$ ) {
        return HTTP_SEE_OTHER;
 }
 
-sub genPathBare( $$$$ ) {
+sub genPathBare( $$$$$ ) {
        my( $req, $address, $printAddr, $started ) = @_;
        my $path;
        if( defined $address ) {
                $path = $address->path();
-               unshift @{$path}, $address if( $printAddr );
        } else {
                $path = [];
        }
-       foreach my $addr ( reverse @{$path} ) {
+       foreach my $item ( reverse @{$path} ) {
+               my( $addr, $exception, $myAddr ) = @{$item};
                if( $started ) {
-                       print " -> ";
+                       if( $exception ) {
+                               print ", ";
+                       } else {
+                               print " -> ";
+                       }
                } else {
                        $started = 1;
                }
-               print "<a href='http://".$req->hostname()."/read/".$addr->get()."'>".encode( $addr->pretty() )."</a>";
+               print "(" if( $exception );
+               if( !$printAddr && $myAddr ) {
+                       print "<strong>".encode( $addr->pretty() )."</strong>";
+               } else {
+                       print "<a href='http://".$req->hostname()."/read/".$addr->get()."'>".encode( $addr->pretty() )."</a>";
+               }
+               print ")" if( $exception );
        }
 }
 
 sub genPath( $$$ ) {
        my( $req, $address, $printAddr ) = @_;
        print "<div class='path'>\n";
-       print "<p><a href='http://".$req->hostname()."/index.html'>Main page</a>";
-       genPathBare( $req, $address, $printAddr, 1 );
+       print "<p><a href='http://".$req->hostname()."/index.html'>Main</a>";
+       genPathBare( $req, $address, $printAddr, 1, 1 );
        print "</div>\n";
 }