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.3 by sashby, Fri Jan 13 18:48:29 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
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;
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;
99	>	($fullurl,$filename)=$self->urlhandler_()->download($urlstring, @_);
100	>
101	>	if ( ( ! defined $filename ) || ( $filename eq "" ) )
102	>	{
103	>	$self->parseerror("Failed to get $fullurl");
104	>	}
105	>
106	>	return ($fullurl,$filename);
107	>	}
108	>
109	>	sub urlget
110	>	{
111	>	my $self=shift;
112	>	my $urlstring=shift;
113
114	<	#    ($fullurl,$filename)=$self->{urlhandler}->get($urlstring, @_);
114	>	($fullurl,$filename)=$self->urlhandler_()->get($urlstring, @_);
115
116	<	#    if ( ( ! defined $filename ) || ( $filename eq "" ) )
117	<	#       {
118	<	#       $self->parseerror("Failed to get $fullurl");
119	<	#       }
120	<	#    return ($fullurl,$filename);
121	<	#    }
116	>	if ( ( ! defined $filename ) || ( $filename eq "" ) )
117	>	{
118	>	$self->parseerror("Failed to get $fullurl");
119	>	}
120	>
121	>	return ($fullurl,$filename);
122	>	}
123	>
124	>	sub urlhandler_()
125	>	{
126	>	my $self=shift;
127	>	@_ ? $self->{urlhandler} = shift
128	>	: $self->{urlhandler};
129	>	}
130
131		1;
132

Diff Legend

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