From 56f7fa2950663b0e26943b3f4460b33118fcd4f7 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 18 Oct 2007 23:02:53 +0000
Subject: [PATCH] Fix for issue 2452: Missing "rejected file" when importing data from LDIF
---
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 0ab8d81..99aeebe 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -1135,6 +1135,18 @@
argList.add(ldifPath);
}
argList.add("-F");
+ String rejectedFile = getUserData().getNewSuffixOptions().getRejectedFile();
+ if (rejectedFile != null)
+ {
+ argList.add("-R");
+ argList.add(rejectedFile);
+ }
+ String skippedFile = getUserData().getNewSuffixOptions().getSkippedFile();
+ if (skippedFile != null)
+ {
+ argList.add("--skipFile");
+ argList.add(skippedFile);
+ }
final String[] args = new String[argList.size()];
argList.toArray(args);
@@ -3423,7 +3435,8 @@
LinkedList<String> ldifPaths = new LinkedList<String>();
ldifPaths.add(ldifPath);
- dataOptions = new NewSuffixOptions(type, baseDns, ldifPaths);
+ dataOptions = NewSuffixOptions.createImportFromLDIF(baseDns, ldifPaths,
+ null, null);
qs.displayFieldInvalid(FieldName.LDIF_PATH, false);
}
break;
@@ -3467,8 +3480,8 @@
// No validation errors
LinkedList<String> baseDns = new LinkedList<String>();
baseDns.add(baseDn);
- dataOptions = new NewSuffixOptions(type, baseDns,
- new Integer(nEntries));
+ dataOptions = NewSuffixOptions.createAutomaticallyGenerated(baseDns,
+ Integer.parseInt(nEntries));
}
break;
@@ -3479,7 +3492,14 @@
{
LinkedList<String> baseDns = new LinkedList<String>();
baseDns.add(baseDn);
- dataOptions = new NewSuffixOptions(type, baseDns);
+ if (type == NewSuffixOptions.Type.CREATE_BASE_ENTRY)
+ {
+ dataOptions = NewSuffixOptions.createBaseEntry(baseDns);
+ }
+ else
+ {
+ dataOptions = NewSuffixOptions.createEmpty(baseDns);
+ }
}
}
--
Gitblit v1.10.0