[svn r11062] oogie : windows compatibility improvement

main/inc/lib/ppt2png/DocumentConverter.java

@@ -64,8 +64,10 @@ public class DocumentConverter {
 				ftpPasswd = "";
 			}
 			if(host.equals("localhost")){
+				if(url.charAt(0)!='/')
+					url = '/'+url;
 				url = "file://"+url;
-				remoteFolder = destinationFolder;
+				remoteFolder = destinationFolder; 
 				remoteFolderFullPath = "file://";
 			}
 			else {

main/newscorm/presentation.class.php

@@ -75,9 +75,14 @@ class presentation extends learnpath {
 		 */
 		$classpath = '-cp .:ridl.jar:js.jar:juh.jar:jurt.jar:jut.jar:java_uno.jar:java_uno_accessbridge.jar:edtftpj-1.5.2.jar:unoil.jar';
 		if(strpos($_ENV['OS'],'Windows') !== false)
+		{
 			$classpath = str_replace(':',';',$classpath);
-		
+		}
 		$cmd = 'cd '.api_get_path(SYS_PATH).'main/inc/lib/ppt2png && java '.$classpath.' DocumentConverter '.api_get_setting('service_ppt2lp','host').' 2002'.' "'.$file.'" "'.$base_work_dir.$created_dir.'"'.' '.api_get_setting('service_ppt2lp','user').' '.api_get_setting('service_ppt2lp','ftp_password');
+		if(strpos($_ENV['OS'],'Windows') !== false)
+		{			
+			$cmd = str_replace('/','\\',$cmd);
+		}
 		
 		chmod ($base_work_dir.$created_dir,0777);