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.4 by williamc, Fri Nov 12 16:59:17 1999 UTC vs.
Revision 1.8 by williamc, Tue Nov 16 17:46:03 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 >        print "base= $base\n";
74 >        my $fullurl=$self->type()."://".(($base ne "")?$base."/":"").
75 >                        $self->file().(($vars ne "")?"\?".$vars:"");
76          return $fullurl;
77   }
78  
# Line 84 | Line 87 | sub transfervars {
87          }
88   }
89  
90 + sub fullfile {
91 +        my $self=shift;
92 +        return $self->{server}
93 + }
94 +
95   sub base {
96          my $self=shift;
97 <        my $base;
98 <        ($base=$self->{server})=~s/(.*\/)/$1/;
97 >        my $base="";
98 >        if ( $self->{server}=~/\/\// ) {
99 >          ($base=$self->{server})=~s/(.*)\/\/.*/$1/;
100 >        }
101 >        elsif ( $self->{server}=~/\// ) {
102 >          ($base=$self->{server})=~s/(.*)\/.*/$1/;
103 >        }  
104          return $base;
105   }
106          
# Line 95 | Line 108 | sub file {
108          my $self=shift;
109          my $file;
110  
111 <        if ( $self->{server}=~/\// ) {
111 >        if ( $self->{server}=~/\/\// ) {
112 >          ($file=$self->{server})=~s/.*\/\/(.*)/$1/;
113 >        }
114 >        elsif ( $self->{server}=~/\// ) {
115            ($file=$self->{server})=~s/.*\///g;
116          }
117          else {
# Line 123 | Line 139 | sub _base {
139            if ( ($server ne "") && ($self->{server}!~/\/\//) &&
140                          ($self->{server}!~/$server/) ) {
141               # only set if not already in there
142 <             $self->{server}=$server."/".$self->{server};
142 >             $self->{server}=$server."\/\/".$self->{server};
143            }
144          }
145          return $self->{server};

Diff Legend

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