Diff of /branches/gage_dev/webwork2/lib/WeBWorK/DB.pm

 Legend:



Removed from v.4599
 


changed lines


 
Added in v.4648
 Legend:



Removed from v.4599
 


changed lines


 
Added in v.4648
-Removed from v.4599
+Added in v.4648

aubreyja at gmail dot com	ViewVC Help
Powered by ViewVC 1.0.9

Revision 4599		Revision 4648
1	################################################################################	1	################################################################################
2	# WeBWorK Online Homework Delivery System	2	# WeBWorK Online Homework Delivery System
3	# Copyright © 2000-2006 The WeBWorK Project, http://openwebwork.sf.net/	3	# Copyright © 2000-2006 The WeBWorK Project, http://openwebwork.sf.net/
4	# $CVSHeader: webwork2/lib/WeBWorK/DB.pm,v 1.84 2006/10/23 17:33:20 sh002i Exp $	4	# $CVSHeader: webwork2/lib/WeBWorK/DB.pm,v 1.86 2006/10/31 18:51:18 sh002i Exp $
5	#	5	#
6	# This program is free software; you can redistribute it and/or modify it under	6	# This program is free software; you can redistribute it and/or modify it under
7	# the terms of either: (a) the GNU General Public License as published by the	7	# the terms of either: (a) the GNU General Public License as published by the
8	# Free Software Foundation; either version 2, or (at your option) any later	8	# Free Software Foundation; either version 2, or (at your option) any later
9	# version, or (b) the "Artistic License" which comes with this package.	9	# version, or (b) the "Artistic License" which comes with this package.
…		…
1208	$using_versionID = $grokked_versionID;	1208	$using_versionID = $grokked_versionID;
1209	$using_vsetID = $setID;	1209	$using_vsetID = $setID;
1210	} else {	1210	} else {
1211	# setID was not versioned	1211	# setID was not versioned
1212	$using_setID = $setID;	1212	$using_setID = $setID;
1213	$using_versionID = $versionID \|\| $self->getUserSetVersionNumver($userID, $setID);	1213	$using_versionID = $versionID \|\| $self->getUserSetVersionNumber($userID, $setID);
1214	$using_vsetID = make_vsetID($using_setID, $using_versionID);	1214	$using_vsetID = make_vsetID($using_setID, $using_versionID);
1215	}	1215	}
1216		1216
1217	return ( $self->getMergedVersionedSets([$userID, $using_setID, $using_vsetID]) )[0];	1217	return ( $self->getMergedVersionedSets([$userID, $using_setID, $using_vsetID]) )[0];
1218	}	1218	}