Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1160] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-08-31 16:58:12
|
Revision: 1160
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1160&view=rev
Author: kurzum
Date: 2008-08-31 16:58:06 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
sc
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
trunk/src/dl-learner/org/dllearner/scripts/SemanticBible2.java
trunk/src/dl-learner/org/dllearner/utilities/Files.java
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-08-31 15:20:00 UTC (rev 1159)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-08-31 16:58:06 UTC (rev 1160)
@@ -31,6 +31,7 @@
import java.util.LinkedList;
import org.apache.log4j.Logger;
+import org.dllearner.utilities.Files;
import org.dllearner.utilities.JamonMonitorLogger;
import com.jamonapi.Monitor;
@@ -121,9 +122,8 @@
this.cacheDir = cacheDir + File.separator;
if (!new File(cacheDir).exists()) {
- logger
- .info("Created directory: " + cacheDir + " : " + new File(cacheDir).mkdir()
- + ".");
+ Files.mkdir(cacheDir);
+ logger.info("Created directory: " + cacheDir + ".");
}
}
@@ -179,10 +179,13 @@
FileInputStream fos = new FileInputStream(filename);
ObjectInputStream o = new ObjectInputStream(fos);
entry = (LinkedList<Object>) o.readObject();
+ o.close();
} catch (IOException e) {
e.printStackTrace();
+ if(Files.debug){System.exit(0);}
} catch (ClassNotFoundException e) {
e.printStackTrace();
+ if(Files.debug){System.exit(0);}
}
// TODO: we need to check whether the query is correct
@@ -297,17 +300,12 @@
* and can thus still be used without creating a new Cache Object
*/
public void clearCache() {
- try{
+
File f = new File(cacheDir);
String[] files = f.list();
for (int i = 0; i < files.length; i++) {
- new File(cacheDir+"/"+files[i]).delete();
- }
- }catch (Exception e) {
- logger.warn("deleting cache failed");
- e.printStackTrace();
- }
-
+ Files.deleteFile(new File(cacheDir+"/"+files[i]));
+ }
}
/**
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-08-31 15:20:00 UTC (rev 1159)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-08-31 16:58:06 UTC (rev 1160)
@@ -21,13 +21,14 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.FileWriter;
+import java.io.File;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import javax.xml.ws.http.HTTPException;
import org.apache.log4j.Logger;
+import org.dllearner.utilities.Files;
import org.dllearner.utilities.JamonMonitorLogger;
import com.hp.hpl.jena.query.ResultSet;
@@ -240,7 +241,15 @@
* @param s the String to log
*/
public static void writeToSparqlLog(String s) {
- try {
+
+ if(!logDeletedOnStart){
+ Files.createFile(new File("log/sparql.txt"),s+"\n");
+ logDeletedOnStart = true;
+ }else{
+ Files.appendFile(new File("log/sparql.txt"), s+"\n");
+ }
+
+ /*try {
FileWriter fw = new FileWriter("log/sparql.txt", logDeletedOnStart);
logDeletedOnStart = true;
@@ -252,7 +261,7 @@
// make the e object more special FileNotFound??
//new File("log").mkdir();
//writeToSparqlLog(s);
- }
+ }*/
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/SemanticBible2.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SemanticBible2.java 2008-08-31 15:20:00 UTC (rev 1159)
+++ trunk/src/dl-learner/org/dllearner/scripts/SemanticBible2.java 2008-08-31 16:58:06 UTC (rev 1160)
@@ -116,6 +116,7 @@
//Cache.getDefaultCache().clearCache();
cm.freeAllComponents();
+
}//end for
}catch (Exception e) {
e.printStackTrace();
Modified: trunk/src/dl-learner/org/dllearner/utilities/Files.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/Files.java 2008-08-31 15:20:00 UTC (rev 1159)
+++ trunk/src/dl-learner/org/dllearner/utilities/Files.java 2008-08-31 16:58:06 UTC (rev 1160)
@@ -31,6 +31,7 @@
*
*/
public class Files {
+ public static boolean debug = true;
/**
* Reads in a file.
@@ -40,15 +41,20 @@
* @return Content of the file.
*/
public static String readFile(File file) throws FileNotFoundException, IOException {
+
+
BufferedReader br = new BufferedReader(new FileReader(file));
+ StringBuffer content = new StringBuffer();
+ try{
String line;
- StringBuffer content = new StringBuffer();
+
while ((line = br.readLine()) != null) {
content.append(line);
content.append(System.getProperty("line.separator"));
}
- br.close();
+ }finally{br.close();}
return content.toString();
+
}
/**
@@ -61,16 +67,17 @@
* Content of the file.
*/
public static void createFile(File file, String content) {
+
try {
FileOutputStream fos = new FileOutputStream(file);
fos.write(content.getBytes());
- fos.close();
+
} catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
+ if(debug){System.exit(0);}
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
+ if(debug){System.exit(0);}
}
}
@@ -88,11 +95,11 @@
fos.write(content.getBytes());
fos.close();
} catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
+ if(debug){System.exit(0);}
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
+ if(debug){System.exit(0);}
}
}
@@ -101,15 +108,27 @@
createFile(file, "");
}catch (Exception e) {
e.printStackTrace();
+ if(debug){System.exit(0);}
}
}
+ public static void deleteFile(File file) {
+
+ try{
+ file.delete();
+ }catch (Exception e) {
+ e.printStackTrace();
+ if(debug){System.exit(0);}
+ }
+ }
+
public static void mkdir(String dir){
if (!new File(dir).exists()) {
try{
new File(dir).mkdir();
}catch (Exception e) {
e.printStackTrace();
+ if(debug){System.exit(0);}
// this should not be a show stopper
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
