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.8 by sashby, Tue Feb 27 11:59:43 2007 UTC

#	Line 30 | Line 30 | URL handling.
30		=cut
31
32		package ActiveDoc::SimpleXMLURLDoc;
33	+
34	+	BEGIN
35	+	{
36	+	die "\n\n".__PACKAGE__.": this package can be dropped from releases.\n\n";
37	+	}
38	+
39		use ActiveDoc::SimpleXMLDoc;
40		use URL::URLhandler;
41		require 5.004;
#	Line 68 | Line 74 | sub new()
74
75		# Set up a URL cache:
76		$self->cache($urlcache);
71	–
77		return $self;
78		}
79
#	Line 79 | Line 84 | sub cache
84		if ( @_ )
85		{
86		$self->{cache}=shift;
87	<	#      $self->{urlhandler}=URL::URLhandler->new($self->{cache});
87	>	$self->urlhandler_(URL::URLhandler->new($self->{cache}));
88		}
89	<
89	>
90		return $self->{cache};
91		}
92
93	<	# sub expandurl
94	<	#    {
95	<	#    my $self=shift;
96	<	#    my $urlstring=shift;
97	<
98	<	#    return $self->{urlhandler}->expandurl($urlstring);
94	<	#    }
93	>	sub expandurl
94	>	{
95	>	my $self=shift;
96	>	my $urlstring=shift;
97	>	return $self->urlhandler_()->expandurl($urlstring);
98	>	}
99
100	<	# sub urldownload
101	<	#    {
102	<	#    my $self=shift;
103	<	#    my $urlstring=shift;
104	<
105	<	#    ($fullurl,$filename)=$self->{urlhandler}->download($urlstring, @_);
106	<	#    if ( ( ! defined $filename ) || ( $filename eq "" ) )
107	<	#       {
108	<	#       $self->parseerror("Failed to get $fullurl");
109	<	#       }
110	<	#    return ($fullurl,$filename);
111	<	#    }
112	<
113	<	# sub urlget
114	<	#    {
115	<	#    my $self=shift;
116	<	#    my $urlstring=shift;
117	<
118	<	#    ($fullurl,$filename)=$self->{urlhandler}->get($urlstring, @_);
100	>	sub urldownload
101	>	{
102	>	my $self=shift;
103	>	my $urlstring=shift;
104	>	my ($fullurl,$filename)=$self->urlhandler_()->download($urlstring, @_);
105	>
106	>	if ( ( ! defined $filename ) || ( $filename eq "" ) )
107	>	{
108	>	$self->parseerror("Failed to get $fullurl");
109	>	}
110	>
111	>	return ($fullurl,$filename);
112	>	}
113	>
114	>	sub urlget
115	>	{
116	>	my $self=shift;
117	>	my $urlstring=shift;
118	>	my ($fullurl,$filename)=$self->urlhandler_()->get($urlstring, @_);
119
120	<	#    if ( ( ! defined $filename ) || ( $filename eq "" ) )
121	<	#       {
122	<	#       $self->parseerror("Failed to get $fullurl");
123	<	#       }
124	<	#    return ($fullurl,$filename);
125	<	#    }
120	>	if ( ( ! defined $filename ) || ( $filename eq "" ) )
121	>	{
122	>	$self->parseerror("Failed to get $fullurl");
123	>	}
124	>
125	>	return ($fullurl,$filename);
126	>	}
127	>
128	>	sub setbaseurl()
129	>	{
130	>	my $self=shift;
131	>	my ($partialurl)=@_;
132	>	return $self->urlhandler_()->setbase($partialurl);
133	>	}
134	>
135	>	sub unsetbaseurl()
136	>	{
137	>	my $self=shift;
138	>	my ($type)=@_;
139	>	$self->urlhandler_()->unsetbase($type);
140	>	}
141	>
142	>	sub urlhandler_()
143	>	{
144	>	my $self=shift;
145	>	@_ ? $self->{urlhandler} = shift
146	>	: $self->{urlhandler};
147	>	}
148	>
149	>	sub parseerror()
150	>	{
151	>	my $self=shift;
152	>	my ($string)=@_;
153	>	die "Error in download: ",$string,"\n";
154	>	}
155
156		1;
157

Diff Legend

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