Skip to content

Z
ZEO
Commit adc281ba authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Fixed bug in reinit.

parent 5a97a90e
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 15 deletions
src/Persistence/cPersistence.c
View file @ adc281ba
/* /*
$Id: cPersistence.c,v 1.5 1997/03/14 22:59:34 jim Exp $ $Id: cPersistence.c,v 1.6 1997/03/20 20:58:25 jim Exp $
C Persistence Module C Persistence Module
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
*****************************************************************************/ *****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.5 1997/03/14 22:59:34 jim Exp $"; static char *what_string = "$Id: cPersistence.c,v 1.6 1997/03/20 20:58:25 jim Exp $";
#include <time.h> #include <time.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -294,9 +294,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args) ...@@ -294,9 +294,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args)
Py_INCREF(oid); Py_INCREF(oid);
ASSIGN(self->oid, oid); ASSIGN(self->oid, oid);
} }
if(self->oid==oid || PyObject_Compare(self->oid, oid)) if((self->oid==oid || PyObject_Compare(self->oid, oid)==0)
&& self->state==cPersistent_UPTODATE_STATE)
{ {
UNLESS(args=PyObject_GetAttr(copy,py___dict__)) return NULL; UNLESS(args=PyObject_GetAttr(copy,py___dict__))
{
printf("Could not get __dict__ of a %s,\n", self->ob_type->tp_name);
PyObject_Print(self,stdout,0);
printf("\n\n");
return NULL;
}
ASSIGN(INSTANCE_DICT(self),args); ASSIGN(INSTANCE_DICT(self),args);
self->state=GHOST_STATE; self->state=GHOST_STATE;
} }
...@@ -720,7 +727,7 @@ void ...@@ -720,7 +727,7 @@ void
initcPersistence() initcPersistence()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.5 $"; char *rev="$Revision: 1.6 $";
PATimeType.ob_type=&PyType_Type; PATimeType.ob_type=&PyType_Type;
...@@ -747,6 +754,9 @@ initcPersistence() ...@@ -747,6 +754,9 @@ initcPersistence()
/**************************************************************************** /****************************************************************************
$Log: cPersistence.c,v $ $Log: cPersistence.c,v $
Revision 1.6 1997/03/20 20:58:25 jim
Fixed bug in reinit.
Revision 1.5 1997/03/14 22:59:34 jim Revision 1.5 1997/03/14 22:59:34 jim
Changed the way Per_setstate was exported to get rid of compilation Changed the way Per_setstate was exported to get rid of compilation
error. error.
......
src/ZODB/cPersistence.c
View file @ adc281ba
/* /*
$Id: cPersistence.c,v 1.5 1997/03/14 22:59:34 jim Exp $ $Id: cPersistence.c,v 1.6 1997/03/20 20:58:25 jim Exp $
C Persistence Module C Persistence Module
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
*****************************************************************************/ *****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.5 1997/03/14 22:59:34 jim Exp $"; static char *what_string = "$Id: cPersistence.c,v 1.6 1997/03/20 20:58:25 jim Exp $";
#include <time.h> #include <time.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -294,9 +294,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args) ...@@ -294,9 +294,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args)
Py_INCREF(oid); Py_INCREF(oid);
ASSIGN(self->oid, oid); ASSIGN(self->oid, oid);
} }
if(self->oid==oid || PyObject_Compare(self->oid, oid)) if((self->oid==oid || PyObject_Compare(self->oid, oid)==0)
&& self->state==cPersistent_UPTODATE_STATE)
{ {
UNLESS(args=PyObject_GetAttr(copy,py___dict__)) return NULL; UNLESS(args=PyObject_GetAttr(copy,py___dict__))
{
printf("Could not get __dict__ of a %s,\n", self->ob_type->tp_name);
PyObject_Print(self,stdout,0);
printf("\n\n");
return NULL;
}
ASSIGN(INSTANCE_DICT(self),args); ASSIGN(INSTANCE_DICT(self),args);
self->state=GHOST_STATE; self->state=GHOST_STATE;
} }
...@@ -720,7 +727,7 @@ void ...@@ -720,7 +727,7 @@ void
initcPersistence() initcPersistence()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.5 $"; char *rev="$Revision: 1.6 $";
PATimeType.ob_type=&PyType_Type; PATimeType.ob_type=&PyType_Type;
...@@ -747,6 +754,9 @@ initcPersistence() ...@@ -747,6 +754,9 @@ initcPersistence()
/**************************************************************************** /****************************************************************************
$Log: cPersistence.c,v $ $Log: cPersistence.c,v $
Revision 1.6 1997/03/20 20:58:25 jim
Fixed bug in reinit.
Revision 1.5 1997/03/14 22:59:34 jim Revision 1.5 1997/03/14 22:59:34 jim
Changed the way Per_setstate was exported to get rid of compilation Changed the way Per_setstate was exported to get rid of compilation
error. error.
......
src/persistent/cPersistence.c
View file @ adc281ba
/* /*
$Id: cPersistence.c,v 1.5 1997/03/14 22:59:34 jim Exp $ $Id: cPersistence.c,v 1.6 1997/03/20 20:58:25 jim Exp $
C Persistence Module C Persistence Module
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
*****************************************************************************/ *****************************************************************************/
static char *what_string = "$Id: cPersistence.c,v 1.5 1997/03/14 22:59:34 jim Exp $"; static char *what_string = "$Id: cPersistence.c,v 1.6 1997/03/20 20:58:25 jim Exp $";
#include <time.h> #include <time.h>
#include "cPersistence.h" #include "cPersistence.h"
...@@ -294,9 +294,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args) ...@@ -294,9 +294,16 @@ Per__p___reinit__(cPersistentObject *self, PyObject *args)
Py_INCREF(oid); Py_INCREF(oid);
ASSIGN(self->oid, oid); ASSIGN(self->oid, oid);
} }
if(self->oid==oid || PyObject_Compare(self->oid, oid)) if((self->oid==oid || PyObject_Compare(self->oid, oid)==0)
&& self->state==cPersistent_UPTODATE_STATE)
{ {
UNLESS(args=PyObject_GetAttr(copy,py___dict__)) return NULL; UNLESS(args=PyObject_GetAttr(copy,py___dict__))
{
printf("Could not get __dict__ of a %s,\n", self->ob_type->tp_name);
PyObject_Print(self,stdout,0);
printf("\n\n");
return NULL;
}
ASSIGN(INSTANCE_DICT(self),args); ASSIGN(INSTANCE_DICT(self),args);
self->state=GHOST_STATE; self->state=GHOST_STATE;
} }
...@@ -720,7 +727,7 @@ void ...@@ -720,7 +727,7 @@ void
initcPersistence() initcPersistence()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.5 $"; char *rev="$Revision: 1.6 $";
PATimeType.ob_type=&PyType_Type; PATimeType.ob_type=&PyType_Type;
...@@ -747,6 +754,9 @@ initcPersistence() ...@@ -747,6 +754,9 @@ initcPersistence()
/**************************************************************************** /****************************************************************************
$Log: cPersistence.c,v $ $Log: cPersistence.c,v $
Revision 1.6 1997/03/20 20:58:25 jim
Fixed bug in reinit.
Revision 1.5 1997/03/14 22:59:34 jim Revision 1.5 1997/03/14 22:59:34 jim
Changed the way Per_setstate was exported to get rid of compilation Changed the way Per_setstate was exported to get rid of compilation
error. error.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7