ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/ActiveDoc/SimpleXMLURLDoc.pm

Comparing COMP/SCRAM/src/ActiveDoc/SimpleXMLURLDoc.pm (file contents):
Revision 1.2 by sashby, Thu Dec 15 16:38:10 2005 UTC vs.
Revision 1.7 by sashby, Wed Feb 15 17:14:17 2006 UTC

#	Line 68 | Line 68 | sub new()
68
69		# Set up a URL cache:
70		$self->cache($urlcache);
71	–
71		return $self;
72		}
73
#	Line 79 | Line 78 | sub cache
78		if ( @_ )
79		{
80		$self->{cache}=shift;
81	<	#      $self->{urlhandler}=URL::URLhandler->new($self->{cache});
81	>	$self->urlhandler_(URL::URLhandler->new($self->{cache}));
82		}
83	<
83	>
84		return $self->{cache};
85		}
86
87	<	# sub expandurl
88	<	#    {
89	<	#    my $self=shift;
90	<	#    my $urlstring=shift;
91	<
92	<	#    return $self->{urlhandler}->expandurl($urlstring);
94	<	#    }
87	>	sub expandurl
88	>	{
89	>	my $self=shift;
90	>	my $urlstring=shift;
91	>	return $self->urlhandler_()->expandurl($urlstring);
92	>	}
93
94	<	# sub urldownload
95	<	#    {
96	<	#    my $self=shift;
97	<	#    my $urlstring=shift;
98	<
99	<	#    ($fullurl,$filename)=$self->{urlhandler}->download($urlstring, @_);
100	<	#    if ( ( ! defined $filename ) || ( $filename eq "" ) )
101	<	#       {
102	<	#       $self->parseerror("Failed to get $fullurl");
103	<	#       }
104	<	#    return ($fullurl,$filename);
105	<	#    }
106	<
107	<	# sub urlget
108	<	#    {
109	<	#    my $self=shift;
110	<	#    my $urlstring=shift;
111	<
112	<	#    ($fullurl,$filename)=$self->{urlhandler}->get($urlstring, @_);
94	>	sub urldownload
95	>	{
96	>	my $self=shift;
97	>	my $urlstring=shift;
98	>	my ($fullurl,$filename)=$self->urlhandler_()->download($urlstring, @_);
99	>
100	>	if ( ( ! defined $filename ) || ( $filename eq "" ) )
101	>	{
102	>	$self->parseerror("Failed to get $fullurl");
103	>	}
104	>
105	>	return ($fullurl,$filename);
106	>	}
107	>
108	>	sub urlget
109	>	{
110	>	my $self=shift;
111	>	my $urlstring=shift;
112	>	my ($fullurl,$filename)=$self->urlhandler_()->get($urlstring, @_);
113
114	<	#    if ( ( ! defined $filename ) || ( $filename eq "" ) )
115	<	#       {
116	<	#       $self->parseerror("Failed to get $fullurl");
117	<	#       }
118	<	#    return ($fullurl,$filename);
119	<	#    }
114	>	if ( ( ! defined $filename ) || ( $filename eq "" ) )
115	>	{
116	>	$self->parseerror("Failed to get $fullurl");
117	>	}
118	>
119	>	return ($fullurl,$filename);
120	>	}
121	>
122	>	sub setbaseurl()
123	>	{
124	>	my $self=shift;
125	>	my ($partialurl)=@_;
126	>	return $self->urlhandler_()->setbase($partialurl);
127	>	}
128	>
129	>	sub unsetbaseurl()
130	>	{
131	>	my $self=shift;
132	>	my ($type)=@_;
133	>	$self->urlhandler_()->unsetbase($type);
134	>	}
135	>
136	>	sub urlhandler_()
137	>	{
138	>	my $self=shift;
139	>	@_ ? $self->{urlhandler} = shift
140	>	: $self->{urlhandler};
141	>	}
142	>
143	>	sub parseerror()
144	>	{
145	>	my $self=shift;
146	>	my ($string)=@_;
147	>	die "Error in download: ",$string,"\n";
148	>	}
149
150		1;
151

Diff Legend

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