details: /erp/devel/dbsm-main/rev/9b9120354cb7
changeset: 271:9b9120354cb7
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 16 16:31:25 2010 +0100
summary: Fixed small issue with the API checking
details: /erp/devel/dbsm-main/rev/3587c8c3d0a1
changeset: 272:3587c8c3d0a1
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 26 12:21:45 2010 +0100
summary: Fixed issue 12484. .svn folders will be filtered and not read when
loading the model.
diffstat:
src/org/openbravo/ddlutils/task/DatabaseUtils.java | 23 +++++++++++---------
src/org/openbravo/ddlutils/task/ExportDatabase.java | 2 +-
2 files changed, 14 insertions(+), 11 deletions(-)
diffs (49 lines):
diff -r 80607b335cdc -r 3587c8c3d0a1
src/org/openbravo/ddlutils/task/DatabaseUtils.java
--- a/src/org/openbravo/ddlutils/task/DatabaseUtils.java Tue Feb 16
11:01:54 2010 +0100
+++ b/src/org/openbravo/ddlutils/task/DatabaseUtils.java Fri Feb 26
12:21:45 2010 +0100
@@ -112,20 +112,23 @@
private static Database readDatabase_noChecks(File f) {
if (f.isDirectory()) {
+ if (f.getAbsolutePath().contains(".svn") ||
f.getAbsolutePath().contains(".hg")) {
+ return new Database();
+ } else {
+ // create an empty database
+ Database d = new Database();
+ d.setName(f.getName());
- // create an empty database
- Database d = new Database();
- d.setName(f.getName());
+ // gets the list and sort
+ File[] filelist = f.listFiles(new XMLFiles());
+ Arrays.sort(filelist, new FilesComparator());
- // gets the list and sort
- File[] filelist = f.listFiles(new XMLFiles());
- Arrays.sort(filelist, new FilesComparator());
+ for (File file : filelist) {
+ d.mergeWith(readDatabase_noChecks(file));
+ }
- for (File file : filelist) {
- d.mergeWith(readDatabase_noChecks(file));
+ return d;
}
-
- return d;
} else {
DatabaseIO dbIO = new DatabaseIO();
dbIO.setValidateXml(false);
diff -r 80607b335cdc -r 3587c8c3d0a1
src/org/openbravo/ddlutils/task/ExportDatabase.java
--- a/src/org/openbravo/ddlutils/task/ExportDatabase.java Tue Feb 16
11:01:54 2010 +0100
+++ b/src/org/openbravo/ddlutils/task/ExportDatabase.java Fri Feb 26
12:21:45 2010 +0100
@@ -195,7 +195,7 @@
}
}
- OBDataset ad = new OBDataset(databaseXMLData, "AD");
+ OBDataset ad = new OBDataset(databaseOrgData, "AD");
final DataComparator dataComparator = new
DataComparator(platform.getSqlBuilder()
.getPlatformInfo(), platform.isDelimitedIdentifierModeOn());
dataComparator.setFilter(DatabaseUtils.getDynamicDatabaseFilter(
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
