added some loggin to page and media objects

Alex Killing · Alex Killing · commit 14a03d824159 · 2015-10-14T11:30:55.000+02:00
diff --git a/Services/COPage/classes/class.ilPageObject.php b/Services/COPage/classes/class.ilPageObject.php
@@ -2617,7 +2617,14 @@ function update($a_validate = true, $a_no_history = false)
 	function delete()
 	{
 		global $ilDB;
-		
+
+		$copg_logger = ilLoggerFactory::getLogger('copg');
+		$copg_logger->debug("ilPageObject: Delete called for ID '".$this->getId()."',".
+			" parent type: '".$this->getParentType()."', ".
+			" hist nr: '".$this->old_nr."', ".
+			" lang: '".$this->getLanguage()."', "
+		);
+
 		$mobs = array();
 		$files = array();
 		
@@ -2627,6 +2634,8 @@ function delete()
 			$mobs = $this->collectMediaObjects(false);
 		}
 
+		$copg_logger->debug("ilPageObject: ... found ".count($mobs)." media objects.");
+
 		$this->__beforeDelete();
 
 		// delete style usages
@@ -2653,17 +2662,25 @@ function delete()
 		// delete media objects
 		foreach ($mobs as $mob_id)
 		{
+			$copg_logger->debug("ilPageObject: ... processing mob ".$mob_id.".");
+
 			if(ilObject::_lookupType($mob_id) != 'mob')
 			{
-				$GLOBALS['ilLog']->write(__METHOD__.': Type mismatch. Ignoring mob with id: '.$mob_id);
+				$copg_logger->debug("ilPageObject: ... type mismatch. Ignoring mob ".$mob_id.".");
 				continue;
 			}
 			
 			if (ilObject::_exists($mob_id))
 			{
+				$copg_logger->debug("ilPageObject: ... delete mob ".$mob_id.".");
+
 				$mob_obj =& new ilObjMediaObject($mob_id);
 				$mob_obj->delete();
 			}
+			else
+			{
+				$copg_logger->debug("ilPageObject: ... missing mob ".$mob_id.".");
+			}
 		}
 
 
diff --git a/Services/COPage/service.xml b/Services/COPage/service.xml
@@ -33,4 +33,5 @@
 		<pagecontent pc_type="src" name="SourceCode" directory="classes" int_links="0" style_classes="0" xsl="0" def_enabled="1"/>
 		<pagecontent pc_type="templ" name="ContentTemplate" directory="classes" int_links="0" style_classes="0" xsl="0" def_enabled="0"/>
 	</copage>
+	<logging />
 </service>
diff --git a/Services/MediaObjects/classes/class.ilObjMediaObject.php b/Services/MediaObjects/classes/class.ilObjMediaObject.php
@@ -99,13 +99,18 @@ public static function _exists($a_id)
 	*/
 	function delete()
 	{
+		$mob_logger = ilLoggerFactory::getLogger('mob');
+		$mob_logger->debug("ilObjMediaObject: Delete called for media object ID '".$this->getId()."'.");
+
 		if (!($this->getId() > 0))
 		{
 			return;
 		}
 
 		$usages = $this->getUsages();
 
+		$mob_logger->debug("ilObjMediaObject: ... Found ".count($usages)." usages.");
+
 		if (count($usages) == 0)
 		{
 			// remove directory
@@ -126,6 +131,19 @@ function delete()
 					
 			// delete object
 			parent::delete();
+
+			$mob_logger->debug("ilObjMediaObject: ... deleted.");
+		}
+		else
+		{
+			foreach ($usages as $u)
+			{
+				$mob_logger->debug("ilObjMediaObject: ... usage type:".$u["type"].
+					", id:".$u["id"].
+					", lang:".$u["lang"].
+					", hist_nr:".$u["hist_nr"].".");
+			}
+			$mob_logger->debug("ilObjMediaObject: ... not deleted.");
 		}
 	}
 
diff --git a/Services/MediaObjects/service.xml b/Services/MediaObjects/service.xml
@@ -13,4 +13,5 @@
 		<secure_path path="mobs" checking-class="ilObjMediaObjectAccess" />
 		<secure_path path="thumbs" checking-class="ilObjMediaObjectAccess" />
 	</web_access_checker>
+	<logging />
 </service>
diff --git a/setup/sql/dbupdate_04.php b/setup/sql/dbupdate_04.php
@@ -12250,10 +12250,13 @@ public function raise($a_component, $a_event, $a_parameter = "") {
 	$ilCtrlStructureReader->getStructure();
 ?>
 <#4775>
-<?php
 $ilDB->modifyTableColumn(
 	'il_dcl_field',
 	'description',
 	array("type" => "clob")
 );
 ?>
+<#4776>
+	$ilCtrlStructureReader->getStructure();
+?>
+

Original file line number	Diff line number	Diff line change
`@@ -2617,7 +2617,14 @@ function update($a_validate = true, $a_no_history = false)`
`2617`	`2617`	`function delete()`
`2618`	`2618`	`{`
`2619`	`2619`	`global $ilDB;`
`2620`		`-`
	`2620`	`+`
	`2621`	`+ $copg_logger = ilLoggerFactory::getLogger('copg');`
	`2622`	`+ $copg_logger->debug("ilPageObject: Delete called for ID '".$this->getId()."',".`
	`2623`	`+ " parent type: '".$this->getParentType()."', ".`
	`2624`	`+ " hist nr: '".$this->old_nr."', ".`
	`2625`	`+ " lang: '".$this->getLanguage()."', "`
	`2626`	`+ );`
	`2627`	`+`
`2621`	`2628`	`$mobs = array();`
`2622`	`2629`	`$files = array();`
`2623`	`2630`
`@@ -2627,6 +2634,8 @@ function delete()`
`2627`	`2634`	`$mobs = $this->collectMediaObjects(false);`
`2628`	`2635`	`}`
`2629`	`2636`
	`2637`	`+ $copg_logger->debug("ilPageObject: ... found ".count($mobs)." media objects.");`
	`2638`	`+`
`2630`	`2639`	`$this->__beforeDelete();`
`2631`	`2640`
`2632`	`2641`	`// delete style usages`
`@@ -2653,17 +2662,25 @@ function delete()`
`2653`	`2662`	`// delete media objects`
`2654`	`2663`	`foreach ($mobs as $mob_id)`
`2655`	`2664`	`{`
	`2665`	`+ $copg_logger->debug("ilPageObject: ... processing mob ".$mob_id.".");`
	`2666`	`+`
`2656`	`2667`	`if(ilObject::_lookupType($mob_id) != 'mob')`
`2657`	`2668`	`{`
`2658`		`- $GLOBALS['ilLog']->write(__METHOD__.': Type mismatch. Ignoring mob with id: '.$mob_id);`
	`2669`	`+ $copg_logger->debug("ilPageObject: ... type mismatch. Ignoring mob ".$mob_id.".");`
`2659`	`2670`	`continue;`
`2660`	`2671`	`}`
`2661`	`2672`
`2662`	`2673`	`if (ilObject::_exists($mob_id))`
`2663`	`2674`	`{`
	`2675`	`+ $copg_logger->debug("ilPageObject: ... delete mob ".$mob_id.".");`
	`2676`	`+`
`2664`	`2677`	`$mob_obj =& new ilObjMediaObject($mob_id);`
`2665`	`2678`	`$mob_obj->delete();`
`2666`	`2679`	`}`
	`2680`	`+ else`
	`2681`	`+ {`
	`2682`	`+ $copg_logger->debug("ilPageObject: ... missing mob ".$mob_id.".");`
	`2683`	`+ }`
`2667`	`2684`	`}`
`2668`	`2685`
`2669`	`2686`
Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,18 @@ public static function _exists($a_id)`
`99`	`99`	`*/`
`100`	`100`	`function delete()`
`101`	`101`	`{`
	`102`	`+ $mob_logger = ilLoggerFactory::getLogger('mob');`
	`103`	`+ $mob_logger->debug("ilObjMediaObject: Delete called for media object ID '".$this->getId()."'.");`
	`104`	`+`
`102`	`105`	`if (!($this->getId() > 0))`
`103`	`106`	`{`
`104`	`107`	`return;`
`105`	`108`	`}`
`106`	`109`
`107`	`110`	`$usages = $this->getUsages();`
`108`	`111`
	`112`	`+ $mob_logger->debug("ilObjMediaObject: ... Found ".count($usages)." usages.");`
	`113`	`+`
`109`	`114`	`if (count($usages) == 0)`
`110`	`115`	`{`
`111`	`116`	`// remove directory`
`@@ -126,6 +131,19 @@ function delete()`
`126`	`131`
`127`	`132`	`// delete object`
`128`	`133`	`parent::delete();`
	`134`	`+`
	`135`	`+ $mob_logger->debug("ilObjMediaObject: ... deleted.");`
	`136`	`+ }`
	`137`	`+ else`
	`138`	`+ {`
	`139`	`+ foreach ($usages as $u)`
	`140`	`+ {`
	`141`	`+ $mob_logger->debug("ilObjMediaObject: ... usage type:".$u["type"].`
	`142`	`+ ", id:".$u["id"].`
	`143`	`+ ", lang:".$u["lang"].`
	`144`	`+ ", hist_nr:".$u["hist_nr"].".");`
	`145`	`+ }`
	`146`	`+ $mob_logger->debug("ilObjMediaObject: ... not deleted.");`
`129`	`147`	`}`
`130`	`148`	`}`
`131`	`149`