[GME-commit] GMESRC/GME/Mga MgaProject.cpp,1.56,1.57

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/Mga
In directory braindrain:/tmp/cvs-serv1243

Modified Files:
	MgaProject.cpp 
Log Message:
no message

CVS User: bogyom

Index: MgaProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** MgaProject.cpp	22 Jul 2004 16:14:33 -0000	1.56
--- MgaProject.cpp	14 Sep 2004 14:13:55 -0000	1.57
***************
*** 184,188 ****
  		try {
  			CComBSTR   fname("Root Folder");
! 			LPCOLESTR p = wcsrchr(projectname, '\\');
  			if(p) {
  				p++;
--- 184,189 ----
  		try {
  			CComBSTR   fname("Root Folder");
!             // BGY: commented out because xml backend has different connection string format
! 			/*LPCOLESTR p = wcsrchr(projectname, '\\');
  			if(p) {
  				p++;
***************
*** 190,194 ****
  				if(p2 == NULL) p2 = p + wcslen(p);
  				fname = CComBSTR(p2-p, p);
! 			}
  			suhr = CreateSetupData(fname, paradigmname, connGUID);
  			COMTHROW(lm->Flush());
--- 191,195 ----
  				if(p2 == NULL) p2 = p + wcslen(p);
  				fname = CComBSTR(p2-p, p);
! 			}*/
  			suhr = CreateSetupData(fname, paradigmname, connGUID);
  			COMTHROW(lm->Flush());
***************
*** 509,513 ****
  					locking_type ppp;
  					COMTHROW(self->get_PeerLockValue(ATTRID_LOCK, &ppp));
! 					if(!(ppp & LOCKING_READ)) self[ATTRID_MDATE] = Now();
  					COMTHROW(CommitTransaction());
  				} catch(hresult_exception &) {
--- 510,516 ----
  					locking_type ppp;
  					COMTHROW(self->get_PeerLockValue(ATTRID_LOCK, &ppp));
! 					//if(!(ppp & LOCKING_READ)) self[ATTRID_MDATE] = Now();
!                     // BGY: this modifies the root every save time, which is bad for the
!                     // xmlbackend (it always tries to check out the root)
  					COMTHROW(CommitTransaction());
  				} catch(hresult_exception &) {
***************
*** 555,559 ****
  					locking_type ppp;
  					COMTHROW(self->get_PeerLockValue(ATTRID_LOCK, &ppp));
! 					if(!(ppp & LOCKING_READ)) self[ATTRID_MDATE] = Now();
  				}
  				GlobalNotify(GLOBALEVENT_CLOSE_PROJECT);
--- 558,564 ----
  					locking_type ppp;
  					COMTHROW(self->get_PeerLockValue(ATTRID_LOCK, &ppp));
! 					//if(!(ppp & LOCKING_READ)) self[ATTRID_MDATE] = Now();
!                     // BGY: this modifies the root every closing time, which is bad for the
!                     // xmlbackend (it always tries to check out the root)
  				}
  				GlobalNotify(GLOBALEVENT_CLOSE_PROJECT);
***************
*** 1266,1273 ****
  //			self[ATTRID_MDATE] = Now();
  		}
! 		COMTHROW(CommitNotify());
! 		baseterr = activeterr= NULL;
  		COMTHROW(dataproject->PopTerritory());
  		COMTHROW(dataproject->CommitTransaction(read_only ? TRANSTYPE_READFIRST: TRANSTYPE_FIRST));
  		read_only = false;
  
--- 1271,1278 ----
  //			self[ATTRID_MDATE] = Now();
  		}
! 		COMTHROW(CommitNotify());		
  		COMTHROW(dataproject->PopTerritory());
  		COMTHROW(dataproject->CommitTransaction(read_only ? TRANSTYPE_READFIRST: TRANSTYPE_FIRST));
+         baseterr = activeterr= NULL;
  		read_only = false;
  
***************
*** 1294,1298 ****
  		if(!baseterr) COMTHROW(E_MGA_NOT_IN_TRANSACTION);
  		aurcnt++;
! 		COMTHROW(dataproject->PopTerritory());
  		COMTHROW(dataproject->AbortTransaction(read_only ? TRANSTYPE_READFIRST:TRANSTYPE_FIRST));
  		baseterr = activeterr= NULL;
--- 1299,1303 ----
  		if(!baseterr) COMTHROW(E_MGA_NOT_IN_TRANSACTION);
  		aurcnt++;
! 		//COMTHROW(dataproject->PopTerritory()); BGY: see committransaction, it is already popped
  		COMTHROW(dataproject->AbortTransaction(read_only ? TRANSTYPE_READFIRST:TRANSTYPE_FIRST));
  		baseterr = activeterr= NULL;