svn commit: r1408976 [35/44] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/config/ applications/accounting/entitydef/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/t...

[erwan]

Modified: 
ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy?rev=1408976&r1=1408975&r2=1408976&view=diff
==============================================================================
--- 
ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy
 (original)
+++ 
ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy
 Tue Nov 13 21:47:18 2012
@@ -34,7 +34,8 @@ outpath = parameters.outpath;
 filename = parameters.filename;
 maxRecStr = parameters.maxrecords;
 entitySyncId = parameters.entitySyncId;
-passedEntityNames = parameters.entityName instanceof Collection ? 
parameters.entityName as TreeSet : [parameters.entityName] as TreeSet;
+passedEntityNames = null;
+if (parameters.entityName) passedEntityNames = parameters.entityName 
instanceof Collection ? parameters.entityName as TreeSet : 
[parameters.entityName] as TreeSet;
 
 // get the max records per file setting and convert to a int
 maxRecordsPerFile = 0;
@@ -179,151 +180,153 @@ reader = delegator.getModelReader();
 modelEntities = reader.getEntityCache().values() as TreeSet;
 context.modelEntities = modelEntities;
 
-if (tobrowser) {
-    session.setAttribute("xmlrawdump_entitylist", passedEntityNames);
-    session.setAttribute("entityDateCond", entityDateCond);
-} else {
-    efo = new EntityFindOptions(true, 
EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, 
true);
-    numberOfEntities = passedEntityNames?.size() ?: 0;
-    context.numberOfEntities = numberOfEntities;
-    numberWritten = 0;
-
-    // single file
-    if (filename && numberOfEntities) {
-        writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new 
FileOutputStream(filename), "UTF-8")));
-        writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-        writer.println("<entity-engine-xml>");
-
-        passedEntityNames.each { curEntityName ->
-            if (entityFrom) {
-                curModelEntity = reader.getModelEntity(curEntityName);
-                if (curModelEntity instanceof ModelViewEntity) {
-                    return;
-                }
-            }
-
-            beganTransaction = TransactionUtil.begin(3600);
-            try {
-                me = reader.getModelEntity(curEntityName);
-                if (me.getNoAutoStamp() || me instanceof ModelViewEntity) {
-                    values = delegator.find(curEntityName, null, null, null, 
me.getPkFieldNames(), efo);
-                } else {
-                    values = delegator.find(curEntityName, entityDateCond, 
null, null, UtilMisc.toList("-createdTxStamp"), efo);
-                }
-
-                curNumberWritten = 0;
-                while (value = values.next()) {
-                    value.writeXmlText(writer, "");
-                    numberWritten++;
-                    curNumberWritten++;
-                    if (curNumberWritten % 500 == 0 || curNumberWritten == 1) {
-                        Debug.log("Records written [$curEntityName]: 
$curNumberWritten Total: $numberWritten");
-                    }
-                }
-                values.close();
-                Debug.log("Wrote [$curNumberWritten] from entity : 
$curEntityName");
-                TransactionUtil.commit(beganTransaction);
-            } catch (Exception e) {
-                errMsg = "Error reading data for XML export:";
-                Debug.logError(e, errMsg, "JSP");
-                TransactionUtil.rollback(beganTransaction, errMsg, e);
-            }
-        }
-        writer.println("</entity-engine-xml>");
-        writer.close();
-        Debug.log("Total records written from all entities: $numberWritten");
-        context.numberWritten = numberWritten;
-    }
-
-    // multiple files in a directory
-    results = [];
-    fileNumber = 1;
-    context.results = results;
-    if (outpath) {
-        outdir = new File(outpath);
-        if (!outdir.exists()) {
-            outdir.mkdir();
-        }
-        if (outdir.isDirectory() && outdir.canWrite()) {
+if (passedEntityNames) {
+    if (tobrowser) {
+        session.setAttribute("xmlrawdump_entitylist", passedEntityNames);
+        session.setAttribute("entityDateCond", entityDateCond);
+    } else {
+        efo = new EntityFindOptions(true, 
EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, 
true);
+        numberOfEntities = passedEntityNames?.size() ?: 0;
+        context.numberOfEntities = numberOfEntities;
+        numberWritten = 0;
+    
+        // single file
+        if (filename && numberOfEntities) {
+            writer = new PrintWriter(new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(filename), "UTF-8")));
+            writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+            writer.println("<entity-engine-xml>");
+    
             passedEntityNames.each { curEntityName ->
-                numberWritten = 0;
-                fileName = preConfiguredSetName ? 
UtilFormatOut.formatPaddedNumber((long) fileNumber, 3) + "_" : "";
-                fileName = fileName + curEntityName;
-
-                values = null;
-                beganTransaction = false;
-                try {
-                    beganTransaction = TransactionUtil.begin(3600);
-
-                    me = delegator.getModelEntity(curEntityName);
-                    if (me instanceof ModelViewEntity) {
-                        results.add("[$fileNumber] [vvv] $curEntityName 
skipping view entity");
+                if (entityFrom) {
+                    curModelEntity = reader.getModelEntity(curEntityName);
+                    if (curModelEntity instanceof ModelViewEntity) {
                         return;
                     }
+                }
+    
+                beganTransaction = TransactionUtil.begin(3600);
+                try {
+                    me = reader.getModelEntity(curEntityName);
                     if (me.getNoAutoStamp() || me instanceof ModelViewEntity) {
                         values = delegator.find(curEntityName, null, null, 
null, me.getPkFieldNames(), efo);
                     } else {
-                        values = delegator.find(curEntityName, entityDateCond, 
null, null, me.getPkFieldNames(), efo);
+                        values = delegator.find(curEntityName, entityDateCond, 
null, null, UtilMisc.toList("-createdTxStamp"), efo);
                     }
-                    isFirst = true;
-                    writer = null;
-                    fileSplitNumber = 1;
+    
+                    curNumberWritten = 0;
                     while (value = values.next()) {
-                        //Don't bother writing the file if there's nothing
-                        //to put into it
-                        if (isFirst) {
-                            writer = new PrintWriter(new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(new File(outdir, fileName +".xml")), 
"UTF-8")));
-                            writer.println("<?xml version=\"1.0\" 
encoding=\"UTF-8\"?>");
-                            writer.println("<entity-engine-xml>");
-                            isFirst = false;
-                        }
                         value.writeXmlText(writer, "");
                         numberWritten++;
-
-                        // split into small files
-                        if (maxRecordsPerFile > 0 && (numberWritten % 
maxRecordsPerFile == 0)) {
-                            fileSplitNumber++;
-                            // close the file
+                        curNumberWritten++;
+                        if (curNumberWritten % 500 == 0 || curNumberWritten == 
1) {
+                            Debug.log("Records written [$curEntityName]: 
$curNumberWritten Total: $numberWritten");
+                        }
+                    }
+                    values.close();
+                    Debug.log("Wrote [$curNumberWritten] from entity : 
$curEntityName");
+                    TransactionUtil.commit(beganTransaction);
+                } catch (Exception e) {
+                    errMsg = "Error reading data for XML export:";
+                    Debug.logError(e, errMsg, "JSP");
+                    TransactionUtil.rollback(beganTransaction, errMsg, e);
+                }
+            }
+            writer.println("</entity-engine-xml>");
+            writer.close();
+            Debug.log("Total records written from all entities: 
$numberWritten");
+            context.numberWritten = numberWritten;
+        }
+    
+        // multiple files in a directory
+        results = [];
+        fileNumber = 1;
+        context.results = results;
+        if (outpath) {
+            outdir = new File(outpath);
+            if (!outdir.exists()) {
+                outdir.mkdir();
+            }
+            if (outdir.isDirectory() && outdir.canWrite()) {
+                passedEntityNames.each { curEntityName ->
+                    numberWritten = 0;
+                    fileName = preConfiguredSetName ? 
UtilFormatOut.formatPaddedNumber((long) fileNumber, 3) + "_" : "";
+                    fileName = fileName + curEntityName;
+    
+                    values = null;
+                    beganTransaction = false;
+                    try {
+                        beganTransaction = TransactionUtil.begin(3600);
+    
+                        me = delegator.getModelEntity(curEntityName);
+                        if (me instanceof ModelViewEntity) {
+                            results.add("[$fileNumber] [vvv] $curEntityName 
skipping view entity");
+                            return;
+                        }
+                        if (me.getNoAutoStamp() || me instanceof 
ModelViewEntity) {
+                            values = delegator.find(curEntityName, null, null, 
null, me.getPkFieldNames(), efo);
+                        } else {
+                            values = delegator.find(curEntityName, 
entityDateCond, null, null, me.getPkFieldNames(), efo);
+                        }
+                        isFirst = true;
+                        writer = null;
+                        fileSplitNumber = 1;
+                        while (value = values.next()) {
+                            //Don't bother writing the file if there's nothing
+                            //to put into it
+                            if (isFirst) {
+                                writer = new PrintWriter(new 
BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(outdir, 
fileName +".xml")), "UTF-8")));
+                                writer.println("<?xml version=\"1.0\" 
encoding=\"UTF-8\"?>");
+                                writer.println("<entity-engine-xml>");
+                                isFirst = false;
+                            }
+                            value.writeXmlText(writer, "");
+                            numberWritten++;
+    
+                            // split into small files
+                            if (maxRecordsPerFile > 0 && (numberWritten % 
maxRecordsPerFile == 0)) {
+                                fileSplitNumber++;
+                                // close the file
+                                writer.println("</entity-engine-xml>");
+                                writer.close();
+    
+                                // create a new file
+                                splitNumStr = 
UtilFormatOut.formatPaddedNumber((long) fileSplitNumber, 3);
+                                writer = new PrintWriter(new 
BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(outdir, 
fileName + "_" + splitNumStr +".xml")), "UTF-8")));
+                                writer.println("<?xml version=\"1.0\" 
encoding=\"UTF-8\"?>");
+                                writer.println("<entity-engine-xml>");
+                            }
+    
+                            if (numberWritten % 500 == 0 || numberWritten == 
1) {
+                                Debug.log("Records written [$curEntityName]: 
$numberWritten");
+                            }
+    
+                        }
+                        if (writer) {
                             writer.println("</entity-engine-xml>");
                             writer.close();
-
-                            // create a new file
-                            splitNumStr = 
UtilFormatOut.formatPaddedNumber((long) fileSplitNumber, 3);
-                            writer = new PrintWriter(new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(new File(outdir, fileName + "_" + 
splitNumStr +".xml")), "UTF-8")));
-                            writer.println("<?xml version=\"1.0\" 
encoding=\"UTF-8\"?>");
-                            writer.println("<entity-engine-xml>");
+                            String thisResult = "[$fileNumber] 
[$numberWritten] $curEntityName wrote $numberWritten records";
+                            Debug.log(thisResult);
+                            results.add(thisResult);
+                        } else {
+                            thisResult = "[$fileNumber] [---] $curEntityName 
has no records, not writing file";
+                            Debug.log(thisResult);
+                            results.add(thisResult);
                         }
-
-                        if (numberWritten % 500 == 0 || numberWritten == 1) {
-                            Debug.log("Records written [$curEntityName]: 
$numberWritten");
+                        values.close();
+                    } catch (Exception ex) {
+                        if (values != null) {
+                            values.close();
                         }
-
-                    }
-                    if (writer) {
-                        writer.println("</entity-engine-xml>");
-                        writer.close();
-                        String thisResult = "[$fileNumber] [$numberWritten] 
$curEntityName wrote $numberWritten records";
-                        Debug.log(thisResult);
-                        results.add(thisResult);
-                    } else {
-                        thisResult = "[$fileNumber] [---] $curEntityName has 
no records, not writing file";
+                        thisResult = "[$fileNumber] [xxx] Error when writing 
$curEntityName: $ex";
                         Debug.log(thisResult);
                         results.add(thisResult);
+                        TransactionUtil.rollback(beganTransaction, thisResult, 
ex);
+                    } finally {
+                        // only commit the transaction if we started one... 
this will throw an exception if it fails
+                        TransactionUtil.commit(beganTransaction);
                     }
-                    values.close();
-                } catch (Exception ex) {
-                    if (values != null) {
-                        values.close();
-                    }
-                    thisResult = "[$fileNumber] [xxx] Error when writing 
$curEntityName: $ex";
-                    Debug.log(thisResult);
-                    results.add(thisResult);
-                    TransactionUtil.rollback(beganTransaction, thisResult, ex);
-                } finally {
-                    // only commit the transaction if we started one... this 
will throw an exception if it fails
-                    TransactionUtil.commit(beganTransaction);
+                    fileNumber++;
                 }
-                fileNumber++;
             }
         }
     }

Modified: 
ofbiz/branches/20120329_portletWidget/framework/widget/config/conditional.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/config/conditional.xml?rev=1408976&r1=1408975&r2=1408976&view=diff
==============================================================================
--- 
ofbiz/branches/20120329_portletWidget/framework/widget/config/conditional.xml 
(original)
+++ 
ofbiz/branches/20120329_portletWidget/framework/widget/config/conditional.xml 
Tue Nov 13 21:47:18 2012
@@ -25,6 +25,7 @@
         <value xml:lang="es">Inicia con</value>
         <value xml:lang="fr">débute</value>
         <value xml:lang="it">Inizia con</value>
+        <value xml:lang="ja">先頭が一致</value>
         <value xml:lang="nl">Begint met</value>
         <value xml:lang="ro">Incepe Cu</value>
         <value xml:lang="ru">Начинается с</value>
@@ -39,6 +40,7 @@
         <value xml:lang="es">Contiene</value>
         <value xml:lang="fr">contient</value>
         <value xml:lang="it">Contiene</value>
+        <value xml:lang="ja">含む</value>
         <value xml:lang="nl">Bevat</value>
         <value xml:lang="ro">Contine</value>
         <value xml:lang="ru">Содержит</value>
@@ -53,6 +55,7 @@
         <value xml:lang="es">Igual</value>
         <value xml:lang="fr">égal</value>
         <value xml:lang="it">Uguale</value>
+        <value xml:lang="ja">等しい</value>
         <value xml:lang="nl">Gelijk aan</value>
         <value xml:lang="ro">Egal</value>
         <value xml:lang="ru">Равняется</value>
@@ -67,6 +70,7 @@
         <value xml:lang="es">Mayor que</value>
         <value xml:lang="fr">plus grand</value>
         <value xml:lang="it">Maggiore di</value>
+        <value xml:lang="ja">より大きい</value>
         <value xml:lang="nl">Groter dan</value>
         <value xml:lang="ro">Mai Mare decat</value>
         <value xml:lang="ru">Больше чем</value>
@@ -81,6 +85,7 @@
         <value xml:lang="es">Mayor igual que</value>
         <value xml:lang="fr">plus grand ou égal</value>
         <value xml:lang="it">Maggiore uguale</value>
+        <value xml:lang="ja">以上</value>
         <value xml:lang="nl">Groter of gelijk aan</value>
         <value xml:lang="ro">Mai Mare sau Egal</value>
         <value xml:lang="ru">Больше чем равно</value>
@@ -95,6 +100,7 @@
         <value xml:lang="es">Mayor que el día</value>
         <value xml:lang="fr">plus grand que le jour</value>
         <value xml:lang="it">Maggiore del giorno di inizio</value>
+        <value xml:lang="ja">以降</value>
         <value xml:lang="nl">Later dan de begin dag</value>
         <value xml:lang="ro">Mai Mare decat ziua Initiala</value>
         <value xml:lang="ru">Больше чем на дату 
начала</value>
@@ -109,6 +115,7 @@
         <value xml:lang="es">Ignorar mayusculas</value>
         <value xml:lang="fr">(Maj/min)</value>
         <value xml:lang="it">Ignora maiuscole/minuscole</value>
+        <value xml:lang="ja">大文字/小文字を区別しない</value>
         <value xml:lang="nl">negeer gr/kl letters</value>
         <value xml:lang="ro">Ignora Majuscule/Minuscule</value>
         <value xml:lang="ru">Игнорировать регистр</value>
@@ -123,6 +130,7 @@
         <value xml:lang="es">Vacio</value>
         <value xml:lang="fr">est vide</value>
         <value xml:lang="it">E' vuoto</value>
+        <value xml:lang="ja">空</value>
         <value xml:lang="nl">Niet gevuld</value>
         <value xml:lang="ro">Este Gol</value>
         <value xml:lang="ru">Является пустым</value>
@@ -137,6 +145,7 @@
         <value xml:lang="es">Menor que</value>
         <value xml:lang="fr">plus petit</value>
         <value xml:lang="it">Minore di</value>
+        <value xml:lang="ja">より小さい</value>
         <value xml:lang="nl">Minder dan</value>
         <value xml:lang="ro">Mai Mic Decat</value>
         <value xml:lang="ru">Меньше чем</value>
@@ -151,6 +160,7 @@
         <value xml:lang="es">Menor que</value>
         <value xml:lang="fr">plus petit ou égal</value>
         <value xml:lang="it">Minore uguale</value>
+        <value xml:lang="ja">以下</value>
         <value xml:lang="nl">minder of gelijk aan</value>
         <value xml:lang="ro">Mai Mic sau Egal</value>
         <value xml:lang="ru">Меньше чем равно</value>
@@ -163,6 +173,7 @@
         <value xml:lang="en">Not Equal</value>
         <value xml:lang="fr">Diff.</value>
         <value xml:lang="it">Diverso da</value>
+        <value xml:lang="ja">異なる</value>
         <value xml:lang="th">ไม่เท่ากับ</value>
         <value xml:lang="zh">不等于</value>
         <value xml:lang="zh_TW">不等于</value>
@@ -174,6 +185,7 @@
         <value xml:lang="es">Igual</value>
         <value xml:lang="fr">même jour</value>
         <value xml:lang="it">Stesso giorno</value>
+        <value xml:lang="ja">同じ日</value>
         <value xml:lang="nl">Zelfde dag</value>
         <value xml:lang="ro">Aceiasi Zi</value>
         <value xml:lang="ru">Тот-же день</value>
@@ -188,6 +200,7 @@
         <value xml:lang="es">Hasta el día</value>
         <value xml:lang="fr">Inclus ce jour</value>
         <value xml:lang="it">Fino al giorno</value>
+        <value xml:lang="ja">以前</value>
         <value xml:lang="nl">t/m datum</value>
         <value xml:lang="ro">Pana in Ziua</value>
         <value xml:lang="ru">До дня</value>
@@ -202,6 +215,7 @@
         <value xml:lang="es">Hasta</value>
         <value xml:lang="fr">Jusqu'au jour</value>
         <value xml:lang="it">Fino ad oggi</value>
+        <value xml:lang="ja">今日まで</value>
         <value xml:lang="nl">tot de datum</value>
         <value xml:lang="ro">Pana Astazi</value>
         <value xml:lang="ru">На день</value>