full_link hack is not needed

Login is redirected properly now

diff --git a/PciIds/Html/List.pm b/PciIds/Html/List.pm
index d244e4fe32a573914fd4805228b6669a78022866..a6ba4aab3379748aa51267fb94825379309c2a9a 100644 (file)
--- a/PciIds/Html/List.pm
+++ b/PciIds/Html/List.pm
@@ -63,7 +63,6 @@ sub list( $$$$ ) {
                print "<p><a href='".buildExcept( 'action', $args )."?action=newhistory'>Discuss</a>\n";
                print "</div>\n" if( $diss );
        }
-       my $url_prefix = $args->{'full_links'} ? 'http://'.$req->hostname() : '';
        unless( $address->leaf() ) {
                print "<h2>Sub-items</h2>\n";
                my $restricts = $address->defaultRestrictList();
@@ -71,15 +70,15 @@ sub list( $$$$ ) {
                        print "<p>";
                        my $url = '/read/'.$address->get().buildExcept( 'restrict', $args ).'?restrict=';
                        foreach( @{$restricts} ) {
-                               print "<a href='".$url_prefix.$url.$_->[0]."'>".$_->[1]."</a> ";
+                               print "<a href='".$url.$_->[0]."'>".$_->[1]."</a> ";
                        }
                }
                my $url = '/read/'.$address->get().buildExcept( 'sort', $args );
                my $sort = ( $args->{'sort'} or 'id' );
                my( $sort_id, $sort_name ) = ( ( $sort eq 'id' ? 'rid' : 'id' ), ( $sort eq 'name' ? 'rname' : 'name' ) );
-               genTableHead( 'subnodes', [ '<a href="'.$url_prefix.$url.'?sort='.$sort_id.'">Id</a>', '<a href="'.$url_prefix.$url.'?sort='.$sort_name.'">Name</a>', 'Note' ], [ 'id-col', 'name-col', 'note-col' ] );
+               genTableHead( 'subnodes', [ '<a href="'.$url.'?sort='.$sort_id.'">Id</a>', '<a href="'.$url.'?sort='.$sort_name.'">Name</a>', 'Note' ], [ 'id-col', 'name-col', 'note-col' ] );
                $args->{'restrict'} = $address->defaultRestrict() unless( defined( $args->{'restrict'} ) );
-               $tables->nodes( $address->get(), $args, $url_prefix );
+               $tables->nodes( $address->get(), $args );
                genTableTail();
        }
        genHtmlTail();

diff --git a/PciIds/Html/Tables.pm b/PciIds/Html/Tables.pm
index e8a42d578ec912df5ae1fc6cbc7bf0d62a23383f..4eab1b3a9c1ca04738ed5c6d72362eba355b7c73 100644 (file)
--- a/PciIds/Html/Tables.pm
+++ b/PciIds/Html/Tables.pm
@@ -10,20 +10,17 @@ sub new( $ ) {
        return bless PciIds::DBQ::new( $dbh );
 }
 
-sub formatLink( $$ ) {
+sub formatLink( $ ) {
        my $address = PciIds::Address::new( shift );
-       my $url_prefix = shift;
-       return '<a href="'.$url_prefix.'/read/'.$address->get().'">'.$address->tail().'</a>';
+       return '<a href="/read/'.$address->get().'">'.$address->tail().'</a>';
 }
 
-sub nodes( $$$$ ) {
-       my( $self, $parent, $args, $url_prefix ) = @_;
+sub nodes( $$$ ) {
+       my( $self, $parent, $args ) = @_;
        my $restrict = $args->{'restrict'};
        $restrict = '' unless( defined $restrict );
        $restrict = PciIds::Address::new( $parent )->restrictRex( $restrict );#How do I know if the restrict is OK?
-       htmlFormatTable( PciIds::DBQ::nodes( $self, $parent, $args, $restrict ), 3, [], [ sub {
-               return formatLink( shift, $url_prefix );
-       }, ], sub { 1; }, sub {
+       htmlFormatTable( PciIds::DBQ::nodes( $self, $parent, $args, $restrict ), 3, [], [ \&formatLink ], sub { 1; }, sub {
                my $name = shift->[ 1 ];
                return ' class="'.( defined $name && $name ne '' ? 'item' : 'unnamedItem' ).'"';
        } );

diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index ec6de57650f3ce50dd40c91f50375410dce652da..cbfa33fa2d4e52e1ef6940dd7c738e092cc22d2e 100644 (file)
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -127,7 +127,6 @@ sub buildExcept( $$ ) {
        my( $except, $args ) = @_;
        my %backup = %{$args};
        delete $backup{$except};
-       delete $backup{'full_links'};#This one is internal
        return buildArgs( \%backup );
 }