From 55d0f77df79a52d553e93800d730aed1c7f0d485 Mon Sep 17 00:00:00 2001
From: rk <rk>
Date: Mon, 24 Nov 2003 23:54:06 +0000
Subject: [PATCH] testing extension xml parser for producer.xml

---
 .../reader/DefaultProducerNodeBuilders.java        | 22 +++++++---------------
 source/mir/storage/Database.java                   |  8 +++++---
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/source/mir/producer/reader/DefaultProducerNodeBuilders.java b/source/mir/producer/reader/DefaultProducerNodeBuilders.java
index a2774072..f7fe8a3f 100755
--- a/source/mir/producer/reader/DefaultProducerNodeBuilders.java
+++ b/source/mir/producer/reader/DefaultProducerNodeBuilders.java
@@ -246,11 +246,8 @@ public class DefaultProducerNodeBuilders {
       skip = (String) anAttributes.get(ENUMERATION_SKIP_ATTRIBUTE);
       extraTables = StringRoutines.splitString(XMLReaderTool.getStringAttributeWithDefault(anAttributes, ENUMERATION_EXTRATABLES_ATTRIBUTE,"").trim(), ",");
       List parts = StringRoutines.splitString(definition.trim()," ");
-      if (parts.size()==1) mainTablePrefix=(String)parts.get(0);
-      if (parts.size()==2) { 
-          mainTablePrefix=(String)parts.get(1);
-          definition=(String)parts.get(0);
-      }
+      if (parts.size()>0) definition=(String)parts.get(0);      
+      if (parts.size()>1) mainTablePrefix=(String)parts.get(1);
     };
 
     public ProducerNode constructNode() {
@@ -444,11 +441,9 @@ public class DefaultProducerNodeBuilders {
       skip = (String) anAttributes.get(LIST_SKIP_ATTRIBUTE);
       extraTables = StringRoutines.splitString(XMLReaderTool.getStringAttributeWithDefault(anAttributes, LIST_EXTRATABLES_ATTRIBUTE,"").trim(), ",");
       List parts = StringRoutines.splitString(definition.trim()," ");
-      if (parts.size()==1) mainTablePrefix=(String)parts.get(0);
-      if (parts.size()==2) { 
-          mainTablePrefix=(String)parts.get(1);
-          definition=(String)parts.get(0);
-      }
+      if (parts.size()>0) definition=(String)parts.get(0);      
+      if (parts.size()>1) mainTablePrefix=(String)parts.get(1);
+               
     };
 
     public ProducerNode constructNode() {
@@ -875,11 +870,8 @@ public class DefaultProducerNodeBuilders {
       process = XMLReaderTool.getStringAttributeWithDefault(anAttributes, BATCHER_PROCESS_ATTRIBUTE, "-1" );    
       extraTables = StringRoutines.splitString(XMLReaderTool.getStringAttributeWithDefault(anAttributes, BATCHER_EXTRATABLES_ATTRIBUTE,"").trim(), ",");
       List parts = StringRoutines.splitString(definition.trim()," ");
-      if (parts.size()==1) mainTablePrefix=(String)parts.get(0);
-      if (parts.size()==2) { 
-          mainTablePrefix=(String)parts.get(1);
-          definition=(String)parts.get(0);
-      }
+      if (parts.size()>0) definition=(String)parts.get(0);      
+      if (parts.size()>1) mainTablePrefix=(String)parts.get(1);
     };
 
     public ProducerNode constructNode() {
diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index c0caf6d7..2c8f7d61 100755
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -75,7 +75,7 @@ import com.codestudio.util.SQLManager;
  * Treiber, Host, User und Passwort, ueber den der Zugriff auf die
  * Datenbank erfolgt.
  *
- * @version $Id: Database.java,v 1.44.2.11 2003/11/24 23:37:18 rk Exp $
+ * @version $Id: Database.java,v 1.44.2.12 2003/11/24 23:54:06 rk Exp $
  * @author rk
  *
  */
@@ -628,8 +628,10 @@ public class Database implements StorageObject {
     // append extratables, if necessary
     if (extraTables!=null) {
       for (int i=0;i < extraTables.size();i++) {
-        countSql.append( ", " + extraTables.get(i));
-        selectSql.append( ", " + extraTables.get(i));
+        if (!extraTables.get(i).equals("")) {        
+          countSql.append( ", " + extraTables.get(i));
+          selectSql.append( ", " + extraTables.get(i));
+        }
       }
     }
     
-- 
2.11.0