You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/09/19 09:36:15 UTC
cvs commit: embperl/driver eplibxslt.c
richter 01/09/19 00:36:15
Modified: . Tag: Embperl2c Makefile.PL
Embperl Tag: Embperl2c Session.pm
Added: driver Tag: Embperl2c eplibxslt.c
Log:
Interface to LibXSLT
Revision Changes Path
No revision
No revision
1.31.4.22 +2 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.21
retrieving revision 1.31.4.22
diff -u -r1.31.4.21 -r1.31.4.22
--- Makefile.PL 2001/09/18 18:01:45 1.31.4.21
+++ Makefile.PL 2001/09/19 07:36:15 1.31.4.22
@@ -1,8 +1,9 @@
#
# Building Makefile for Embperl
#
-# (C) 1997-1999 G.Richter (richter@dev.ecos.de) / ECOS
+# (C) 1997-2001 G.Richter (richter@dev.ecos.de) / ECOS
#
+# $Id: Makefile.PL,v 1.31.4.22 2001/09/19 07:36:15 richter Exp $
#
No revision
No revision
1.4.4.5 +22 -0 embperl/Embperl/Session.pm
Index: Session.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Session.pm,v
retrieving revision 1.4.4.4
retrieving revision 1.4.4.5
diff -u -r1.4.4.4 -r1.4.4.5
--- Session.pm 2001/09/19 06:06:43 1.4.4.4
+++ Session.pm 2001/09/19 07:36:15 1.4.4.5
@@ -239,11 +239,19 @@
my $session_id = $self->{data}->{_session_id} ;
+<<<<<<< Session.pm
if (!$session_id && $self -> {idfrom})
{
$session_id = $self->{data}->{_session_id} = &{$self->{generate}}($self, $self -> {idfrom}) ;
}
+=======
+ if (!$session_id && $self -> {idfrom})
+ {
+ $session_id = $self->{data}->{_session_id} = &{$self->{generate}}($self, $self -> {idfrom}) ;
+ }
+
+>>>>>>> 1.4.4.4
$self->{initial_session_id} ||= $session_id ;
$self->populate;
@@ -413,6 +421,19 @@
$self->{'status'} = 0 ;
$self->{data}->{_session_id} = $self->{initial_session_id} = shift ;
+<<<<<<< Session.pm
+}
+
+sub setidfrom {
+ my $self = shift;
+
+ $self->{'status'} = 0 ;
+ $self->{data}->{_session_id} = $self->{initial_session_id} = undef ;
+ $self->{idfrom} = shift ;
+
+}
+
+=======
}
sub setidfrom {
@@ -424,6 +445,7 @@
}
+>>>>>>> 1.4.4.4
sub getid {
my $self = shift;
No revision
No revision
1.1.2.1 +153 -0 embperl/driver/Attic/eplibxslt.c
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org