Menu
▾
▴
[WWcvs] wwmoodle: Modified file to use the internal configuration of the wwlink block rather than the data from wwassignment_bridge The
|
From: Mike G. v. a. <we...@ma...> - 2008-08-24 03:07:33
|
Log Message:
-----------
Modified file to use the internal configuration of the wwlink block rather than
the data from wwassignment_bridge
The instance behavior needs more detailed warning message when no webwork course is connected
or when it does not have the desired course.
Modified Files:
--------------
wwmoodle/wwassignment4/moodle/mod/wwassignment:
backuplib.php
lib.php
locallib.php
restorelib.php
wwmoodle/wwassignment4/moodle/mod/wwassignment/db:
install.xml
upgrade.php
Revision Data
-------------
Index: restorelib.php
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/mod/wwassignment/restorelib.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwwassignment4/moodle/mod/wwassignment/restorelib.php -Lwwassignment4/moodle/mod/wwassignment/restorelib.php -u -r1.2 -r1.3
--- wwassignment4/moodle/mod/wwassignment/restorelib.php
+++ wwassignment4/moodle/mod/wwassignment/restorelib.php
@@ -27,12 +27,12 @@
global $CFG;
$status = true;
- error_log("mod id ".$mod->id);
- if ($mod->id == "66666") {
- $wwlinkdata = backup_getid($restore->backup_unique_code,"wwassignment_bridge","wwassignment_bridge");
- error_log("wwlink data ".print_r($wwlinkdata, true ));
- return $status;
- }
+ //error_log("mod id ".$mod->id);
+// if ($mod->id == "66666") {
+// $wwlinkdata = backup_getid($restore->backup_unique_code,"wwassignment_bridge","wwassignment_bridge");
+// error_log("wwlink data ".print_r($wwlinkdata, true ));
+// return $status;
+// }
//Get record from backup_ids
@@ -78,7 +78,7 @@
} else {
$status = false;
}
- error_log("mod id is ".print_r($mod,true));
+ //error_log("mod id is ".print_r($mod,true));
return $status;
}
Index: lib.php
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/mod/wwassignment/lib.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lwwassignment4/moodle/mod/wwassignment/lib.php -Lwwassignment4/moodle/mod/wwassignment/lib.php -u -r1.4 -r1.5
--- wwassignment4/moodle/mod/wwassignment/lib.php
+++ wwassignment4/moodle/mod/wwassignment/lib.php
@@ -472,16 +472,21 @@
function wwassignment_delete_course() {
+ error_log("Begin wwassignment_delete_course --not used yet");
}
function wwassignment_process_options() {
+ error_log("Begin wwassignment_process_options --not used yet");
+
}
function wwassignment_reset_course_form() {
+ error_log("Begin wwassignment_reset_course_form --not used yet");
}
function wwassignment_delete_userdata() {
-
+ error_log("Begin wwassignment_delete_userdata --not used yet");
+
}
/**
@@ -489,6 +494,8 @@
*/
function wwassignment_print_recent_activity($course, $isteacher, $timestart) {
global $CFG;
+ error_log("Begin wwassignment_print_recent_activity --not used yet");
+
return false; // True if anything was printed, otherwise false
}
@@ -513,7 +520,6 @@
*/
function wwassignment_get_participants($wwassignmentid) {
- error_log("wwassignment_get_participants");
$wwassignment = get_record('wwassignment', 'id', $wwassignmentid);
if(!isset($wwassignment)) {
return array();
Index: locallib.php
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/mod/wwassignment/locallib.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lwwassignment4/moodle/mod/wwassignment/locallib.php -Lwwassignment4/moodle/mod/wwassignment/locallib.php -u -r1.3 -r1.4
--- wwassignment4/moodle/mod/wwassignment/locallib.php
+++ wwassignment4/moodle/mod/wwassignment/locallib.php
@@ -185,13 +185,22 @@
* @return string the name of the webwork course on success and -1 on failure.
*/
function _wwassignment_mapped_course($courseid,$silent = true) {
- $wwassignmentbridge = get_record('wwassignment_bridge','course', $courseid);
- if((isset($wwassignmentbridge)) && (isset($wwassignmentbridge->webwork_course))) {
- return $wwassignmentbridge->webwork_course;
- }
- if(!$silent) {
- print_error('webwork_course_map_failure','wwassignment');
+ $wwlink = get_record('block','name','wwlink');
+ //error_log("wwlink".print_r($wwlink,true));
+ $blockinstance = get_record('block_instance','blockid', $wwlink->id,'pageid',$courseid,'pagetype','course-view');
+ //error_log("block instance".print_r($blockinstance,true));
+ $block_config = unserialize(base64_decode($blockinstance->configdata));
+ //error_log("config_data ".print_r($block_config,true));
+ if ( isset($block_config) && isset($block_config->webwork_link_id) ) {
+ return $block_config->webwork_link_id;
}
+// $wwassignmentbridge = get_record('wwassignment_bridge','course', $courseid);
+// if((isset($wwassignmentbridge)) && (isset($wwassignmentbridge->webwork_course))) {
+// return $wwassignmentbridge->webwork_course;
+// }
+// if(!$silent) {
+// print_error('webwork_course_map_failure','wwassignment');
+// }
return -1;
}
Index: backuplib.php
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/mod/wwassignment/backuplib.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwwassignment4/moodle/mod/wwassignment/backuplib.php -Lwwassignment4/moodle/mod/wwassignment/backuplib.php -u -r1.2 -r1.3
--- wwassignment4/moodle/mod/wwassignment/backuplib.php
+++ wwassignment4/moodle/mod/wwassignment/backuplib.php
@@ -25,8 +25,8 @@
function wwassignment_backup_mods($bf,$preferences) {
- error_log("wwassignment_backup_mods");
- //error_log("preferences ".print_r($preferences,true));
+ //error_log("wwassignment_backup_mods");
+ ////error_log("preferences ".print_r($preferences,true));
global $CFG;
$status = true;
@@ -35,7 +35,7 @@
$wwassignments = get_records ("wwassignment","course",$preferences->backup_course);
if ($wwassignments) {
foreach ($wwassignments as $wwassignment) {
- //error_log("backing up wwassignment ".$wwassignment->id);
+ ////error_log("backing up wwassignment ".$wwassignment->id);
if (backup_mod_selected($preferences,'wwassignment',$wwassignment->id)) {
$status = wwassignment_backup_one_mod($bf,$preferences,$wwassignment);
// backup files happens in backup_one_mod now too.
@@ -45,15 +45,14 @@
- error_log("end wwassignment_backup_mods");
+ //error_log("end wwassignment_backup_mods");
return $status;
}
function wwassignment_backup_one_mod($bf,$preferences,$wwassignment) {
- error_log("wwassignment_backup_one_mod");
- //error_log("preferences ".print_r($preferences,true));
+ //error_log("wwassignment_backup_one_mod");
+ ////error_log("preferences ".print_r($preferences,true));
global $CFG;
- global $BaCkUpWWassignment_bridge ; // hack to back up wwassignment_bridge table just once
if (is_numeric($wwassignment)) {
$wwassignment = get_record('wwassignment','id',$wwassignment);
@@ -77,21 +76,9 @@
$status =fwrite ($bf,end_tag("MOD",3,true));
- error_log("end wwassignment_one_backup_mod");
- error_log("preferences ".print_r($preferences,true));
- if ($status and !$BaCkUpWWassignment_bridge) {
- $BaCkUpWWassignment_bridge = 1 ; // don't back it up again
- $wwassignment_bridge =get_record("wwassignment_bridge","course",$preferences->backup_course);
- error_log("writing wwassignment_bridge");
- fwrite ($bf,start_tag("MOD",3,true));
- //Print wwassignment_bridge data
- fwrite ($bf,full_tag("ID",4,false,"66666"));
- fwrite ($bf,full_tag("MODTYPE",4,false,"wwassignment"));
- fwrite ($bf,full_tag("WEBWORK_COURSE",4,false,$wwassignment_bridge->webwork_course));
- fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$wwassignment_bridge->timemodified));
- $status =fwrite ($bf,end_tag("MOD",3,true));
- error_log("wwassignment_bridge backed up");
- }
+ //error_log("end wwassignment_one_backup_mod");
+ //error_log("preferences ".print_r($preferences,true));
+
return $status;
@@ -100,10 +87,10 @@
//Return an array of info (name,value)
function wwassignment_check_backup_mods($course,$user_data=false,$backup_unique_code,$instances=null) {
- //error_log("wwassignment_check_backup_mods ");
- //error_log("user_data ".print_r($user_data,true) );
- //error_log("backup code ".print_r($backup_unique_code,true));
- //error_log("instance ".print_r($instance,true));
+ ////error_log("wwassignment_check_backup_mods ");
+ ////error_log("user_data ".print_r($user_data,true) );
+ ////error_log("backup code ".print_r($backup_unique_code,true));
+ ////error_log("instance ".print_r($instance,true));
$info=array();
if (!empty($instances) && is_array($instances) && count($instances)) {
foreach ($instances as $id => $instance) {
@@ -119,16 +106,16 @@
$info[0][1] = 0;
}
- //error_log("end wwassignment_check_backup_mods");
+ ////error_log("end wwassignment_check_backup_mods");
return $info;
}
//Return an array of info (name,value)
function wwassignment_check_backup_mods_instances($instance,$backup_unique_code) {
- //error_log("wwassignment_check_backup_mods_instances ");
- //error_log("content ".print_r($content,true));
- //error_log("preferences ".print_r($preferences,true));
+ ////error_log("wwassignment_check_backup_mods_instances ");
+ ////error_log("content ".print_r($content,true));
+ ////error_log("preferences ".print_r($preferences,true));
$info[$instance->id.'0'][0] = '<b>'.$instance->name.'</b>';
$info[$instance->id.'0'][1] = '';
@@ -140,7 +127,7 @@
// $info[$instance->id.'1'][1] = 0;
// }
// }
- //error_log("end wwassignment_check_backup_mods_instances");
+ ////error_log("end wwassignment_check_backup_mods_instances");
return $info;
}
@@ -168,13 +155,13 @@
//Returns an array of assignments id
function wwassignment_ids ($course) {
- //error_log("wwassignment_ids ");
- //error_log("course ".print_r($course,true));
+ ////error_log("wwassignment_ids ");
+ ////error_log("course ".print_r($course,true));
global $CFG;
- //error_log("end wwassignment_ids");
+ ////error_log("end wwassignment_ids");
return get_records_sql ("SELECT a.id, a.course
FROM {$CFG->prefix}wwassignment a
Index: upgrade.php
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/mod/wwassignment/db/upgrade.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lwwassignment4/moodle/mod/wwassignment/db/upgrade.php -Lwwassignment4/moodle/mod/wwassignment/db/upgrade.php -u -r1.4 -r1.5
--- wwassignment4/moodle/mod/wwassignment/db/upgrade.php
+++ wwassignment4/moodle/mod/wwassignment/db/upgrade.php
@@ -60,12 +60,12 @@
/// Define field timemodified to be added to wwassignment
- $table = new XMLDBTable('wwassignment_bridge');
- $field = new XMLDBField('timemodified');
- $field->setAttributes(XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'webwork_course');
-
- /// Launch add field timemodified to wwassignment_bridge
- $result = $result && add_field($table, $field);
+// $table = new XMLDBTable('wwassignment_bridge');
+// $field = new XMLDBField('timemodified');
+// $field->setAttributes(XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'webwork_course');
+//
+// /// Launch add field timemodified to wwassignment_bridge
+// $result = $result && add_field($table, $field);
//notify('Processing assignment grades, this may take a while if there are many assignments...', 'notifysuccess');
Index: install.xml
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/mod/wwassignment/db/install.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwwassignment4/moodle/mod/wwassignment/db/install.xml -Lwwassignment4/moodle/mod/wwassignment/db/install.xml -u -r1.2 -r1.3
--- wwassignment4/moodle/mod/wwassignment/db/install.xml
+++ wwassignment4/moodle/mod/wwassignment/db/install.xml
@@ -14,17 +14,6 @@
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for data"/>
</KEYS>
</TABLE>
- <TABLE NAME="wwassignment_bridge" COMMENT="" PREVIOUS="wwassignment">
- <FIELDS>
- <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="course"/>
- <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="webwork_course"/>
- <FIELD NAME="webwork_course" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="course"/>
- <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="webwork_set"/>
- </FIELDS>
- <KEYS>
- <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for data"/>
- </KEYS>
- </TABLE>
</TABLES>
<STATEMENTS>
</STATEMENTS>
|
