ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/URL/URLclass.pm

Comparing COMP/SCRAM/src/URL/URLclass.pm (file contents):
Revision 1.7 by williamc, Fri Nov 12 18:09:20 1999 UTC vs.
Revision 1.8 by williamc, Tue Nov 16 17:46:03 1999 UTC

#	Line 69 | 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 93 | Line 95 | sub fullfile {
95		sub base {
96		my $self=shift;
97		my $base="";
98	<	if ( $self->{server}=~/\// ) {
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;
#	Line 103 | 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 131 | 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