fix: several testcases to the new configuration/structure

[gigi.git] / src / org / cacert / gigi / database / SQLFileManager.java

diff --git a/src/org/cacert/gigi/database/SQLFileManager.java b/src/org/cacert/gigi/database/SQLFileManager.java
index 676d9e66e129f992217bf74ed92c0ec8ac57e3be..e51e52165d5c0c986623dd5f245c008601a3dd40 100644 (file)
--- a/src/org/cacert/gigi/database/SQLFileManager.java
+++ b/src/org/cacert/gigi/database/SQLFileManager.java
@@ -36,6 +36,9 @@ public class SQLFileManager {
             if (string.equals("")) {
                 continue;
             }
+            if ((string.contains("profiles") || string.contains("cacerts")) && type != ImportType.PRODUCTION) {
+                continue;
+            }
             if (m.matches() && type == ImportType.TRUNCATE) {
                 String sql2 = "TRUNCATE `" + m.group(1) + "`";
                 stmt.addBatch(sql2);
@@ -56,6 +59,6 @@ public class SQLFileManager {
         while ((len = f.read(buf)) > 0) {
             baos.write(buf, 0, len);
         }
-        return new String(baos.toByteArray());
+        return new String(baos.toByteArray(), "UTF-8");
     }
 }