[Logicampus-cvs] logicampus/src/logicreate/lib/lob lc_lob.php, 1.2, 1.3 lc_lob_xml.php, 1.2, 1.3

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib/lob
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25933/lib/lob

Modified Files:
	lc_lob.php lc_lob_xml.php 
Log Message:
properly import lesson, lesson sequence, and content learning objects from a backup file.

Index: lc_lob.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lob/lc_lob.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lc_lob.php	2 Mar 2008 19:00:38 -0000	1.2
--- lc_lob.php	2 Mar 2008 21:59:00 -0000	1.3
***************
*** 266,271 ****
  		
  
! 		$this->lobSub->lobRepoEntryId = $this->repoObj->getPrimaryKey();
! 		$this->lobSub->save();
  
  		$this->lobMetaObj->updatedOn = time();
--- 266,273 ----
  		
  
! 		if (is_object($this->lobSub) ) {
! 			$this->lobSub->lobRepoEntryId = $this->repoObj->getPrimaryKey();
! 			$this->lobSub->save();
! 		}
  
  		$this->lobMetaObj->updatedOn = time();

Index: lc_lob_xml.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lob/lc_lob_xml.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lc_lob_xml.php	2 Mar 2008 19:00:39 -0000	1.2
--- lc_lob_xml.php	2 Mar 2008 21:59:00 -0000	1.3
***************
*** 1,5 ****
  <?php
  
- 
  /**
   * Process Learning Object XML formats
--- 1,4 ----
***************
*** 92,120 ****
  		}
  
  		$lobSub = null;
  
! 		if ($lobObj->lobType == 'content') {
  			$lobSub = $this->makeContentNode($n);
  		}
! 		if ($lobObj->lobType == 'activity') {
  			$lobSub = $this->makeActivityNode($n);
  		}
  
  		if ( is_object($lobSub) ) {
! 			$lob->lobSub = $lobSub;
  		}
  
! 		$lobMetaObj = Lc_Lob_Xml::processLobMeta($n);
! 		$lobUserObj = new LobUserLink();
! 
! 		/*
! 		$lobUserObj->set('lobRepoEntryId',$lobObj->getPrimaryKey());
! 		$lobUserObj->set('userId',$u->userId);
! 		$lobUserObj->set('isOwner','1');
! 		$lobUserObj->save();
! 		 */
! 
! 		return $lob;
! //		debug($children);
  	}
  
--- 91,124 ----
  		}
  
+ 		$lobMetaObj = Lc_Lob_Xml::processLobMeta($n);
+ 		$lobUserObj = new LobUserLink();
+ 
+ 		/*
+ 		$lobUserObj->set('lobRepoEntryId',$lob->getPrimaryKey());
+ 		$lobUserObj->set('userId',$u->userId);
+ 		$lobUserObj->set('isOwner','1');
+ 		$lobUserObj->save();
+ 		 */
+ 
+ 		//make the final wrapper object
+ 		$lcLob = new Lc_Lob();
+ 		$lcLob->repoObj = $lob;
+ 		$lcLob->lobMetaObj = $lobMetaObj;
+ 		$lcLob->type = $lob->lobType;
+ 
  		$lobSub = null;
  
! 		if ($lob->lobType == 'content') {
  			$lobSub = $this->makeContentNode($n);
  		}
! 		if ($lob->lobType == 'activity') {
  			$lobSub = $this->makeActivityNode($n);
  		}
  
  		if ( is_object($lobSub) ) {
! 			$lcLob->lobSub = $lobSub;
  		}
  
! 		return $lcLob;
  	}
  
***************
*** 128,133 ****
  
  
! 		$lob = null;
! 		$lob = new LobMetadata();
  
  		foreach($children as $childNode) {
--- 132,136 ----
  
  
! 		$meta = new LobMetadata();
  
  		foreach($children as $childNode) {
***************
*** 138,143 ****
  			$tag = $childNode->tagName;
  			$subchild = $childNode->childNodes;
! 			$lob->set($tag, trim($subchild->item(0)->nodeValue) );
  		}
  	}
  /*
--- 141,147 ----
  			$tag = $childNode->tagName;
  			$subchild = $childNode->childNodes;
! 			$meta->set($tag, trim($subchild->item(0)->nodeValue) );
  		}
+ 		return $meta;
  	}
  /*