ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/URL/URLclass.pm
(Generate patch)

Comparing COMP/SCRAM/src/URL/URLclass.pm (file contents):
Revision 1.5 by williamc, Fri Nov 12 17:07:53 1999 UTC vs.
Revision 1.9 by williamc, Tue Nov 16 17:46:20 1999 UTC

# Line 13 | Line 13
13   # expandurl(URLbase) : expand the url to include the given base
14   # file()        : return the filename from the end of the path
15   # base()        : return the basename of the path
16 + # fullfile()    : return base/file
17   # param(var)    : return the value of a url parameter
18   #
19   # -- specialised use methods
# Line 68 | Line 69 | sub url {
69          my $self=shift;
70          
71          my $vars=$self->_vartostring();
72 <        my $fullurl=$self->type()."://".$self->{server}.
73 <                        (($vars ne "")?"\?".$vars:"");
72 >        my $base=$self->base();
73 >        my $fullurl=$self->type()."://".(($base ne "")?$base."/":"").
74 >                        $self->file().(($vars ne "")?"\?".$vars:"");
75          return $fullurl;
76   }
77  
# Line 84 | Line 86 | sub transfervars {
86          }
87   }
88  
89 + sub fullfile {
90 +        my $self=shift;
91 +        return $self->{server}
92 + }
93 +
94   sub base {
95          my $self=shift;
96          my $base="";
97 <        if ( $self->{server}=~/\// ) {
98 <          ($base=$self->{server})=~s/(.*\/).*/$1/;
97 >        if ( $self->{server}=~/\/\// ) {
98 >          ($base=$self->{server})=~s/(.*)\/\/.*/$1/;
99 >        }
100 >        elsif ( $self->{server}=~/\// ) {
101 >          ($base=$self->{server})=~s/(.*)\/.*/$1/;
102          }  
103          return $base;
104   }
# Line 97 | Line 107 | sub file {
107          my $self=shift;
108          my $file;
109  
110 <        if ( $self->{server}=~/\// ) {
110 >        if ( $self->{server}=~/\/\// ) {
111 >          ($file=$self->{server})=~s/.*\/\/(.*)/$1/;
112 >        }
113 >        elsif ( $self->{server}=~/\// ) {
114            ($file=$self->{server})=~s/.*\///g;
115          }
116          else {
# Line 125 | Line 138 | sub _base {
138            if ( ($server ne "") && ($self->{server}!~/\/\//) &&
139                          ($self->{server}!~/$server/) ) {
140               # only set if not already in there
141 <             $self->{server}=$server."/".$self->{server};
141 >             $self->{server}=$server."\/\/".$self->{server};
142            }
143          }
144          return $self->{server};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines